net: phy: fixed_phy: remove fixed_phy_register_with_gpiod

Since its introduction 6 yrs ago this functions has never had a user.
So remove it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/ccbeef28-65ae-4e28-b1db-816c44338dee@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index ee7831a9849b3728ca9c541da35d17e089985da2..c91adf2464c55c0c919726b81922703f1198a101 100644 (file)
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -223,12 +223,12 @@ static struct gpio_desc *fixed_phy_get_gpiod(struct device_node *np)
 }
 #endif
 
-static struct phy_device *__fixed_phy_register(unsigned int irq,
-                                              struct fixed_phy_status *status,
-                                              struct device_node *np,
-                                              struct gpio_desc *gpiod)
+struct phy_device *fixed_phy_register(unsigned int irq,
+                                     struct fixed_phy_status *status,
+                                     struct device_node *np)
 {
        struct fixed_mdio_bus *fmb = &platform_fmb;
+       struct gpio_desc *gpiod;
        struct phy_device *phy;
        int phy_addr;
        int ret;
@@ -237,11 +237,9 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
                return ERR_PTR(-EPROBE_DEFER);
 
        /* Check if we have a GPIO associated with this fixed phy */
-       if (!gpiod) {
-               gpiod = fixed_phy_get_gpiod(np);
-               if (IS_ERR(gpiod))
-                       return ERR_CAST(gpiod);
-       }
+       gpiod = fixed_phy_get_gpiod(np);
+       if (IS_ERR(gpiod))
+               return ERR_CAST(gpiod);
 
        /* Get the next available PHY address, up to PHY_MAX_ADDR */
        phy_addr = ida_alloc_max(&phy_fixed_ida, PHY_MAX_ADDR - 1, GFP_KERNEL);
@@ -306,24 +304,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq,
 
        return phy;
 }
-
-struct phy_device *fixed_phy_register(unsigned int irq,
-                                     struct fixed_phy_status *status,
-                                     struct device_node *np)
-{
-       return __fixed_phy_register(irq, status, np, NULL);
-}
 EXPORT_SYMBOL_GPL(fixed_phy_register);
 
-struct phy_device *
-fixed_phy_register_with_gpiod(unsigned int irq,
-                             struct fixed_phy_status *status,
-                             struct gpio_desc *gpiod)
-{
-       return __fixed_phy_register(irq, status, NULL, gpiod);
-}
-EXPORT_SYMBOL_GPL(fixed_phy_register_with_gpiod);
-
 void fixed_phy_unregister(struct phy_device *phy)
 {
        phy_device_remove(phy);

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index 1acafd86ab138d033a7fe578ae0f6ee1c741b6ce..3392c09b5d24adc7e61ba2a1c40c5bca90dbcb44 100644 (file)
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -13,7 +13,6 @@ struct fixed_phy_status {
 };
 
 struct device_node;
-struct gpio_desc;
 struct net_device;
 
 #if IS_ENABLED(CONFIG_FIXED_PHY)
@@ -24,11 +23,6 @@ extern struct phy_device *fixed_phy_register(unsigned int irq,
                                             struct fixed_phy_status *status,
                                             struct device_node *np);
 
-extern struct phy_device *
-fixed_phy_register_with_gpiod(unsigned int irq,
-                             struct fixed_phy_status *status,
-                             struct gpio_desc *gpiod);
-
 extern void fixed_phy_unregister(struct phy_device *phydev);
 extern int fixed_phy_set_link_update(struct phy_device *phydev,
                        int (*link_update)(struct net_device *,
@@ -46,14 +40,6 @@ static inline struct phy_device *fixed_phy_register(unsigned int irq,
        return ERR_PTR(-ENODEV);
 }
 
-static inline struct phy_device *
-fixed_phy_register_with_gpiod(unsigned int irq,
-                             struct fixed_phy_status *status,
-                             struct gpio_desc *gpiod)
-{
-       return ERR_PTR(-ENODEV);
-}
-
 static inline void fixed_phy_unregister(struct phy_device *phydev)
 {
 }