Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / include / linux / phy_fixed.h

diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index 9525567b195113053d59d72b453f720a0c233706..1e5d86ebdaeb54cb5718ff10c8a8f74adc3a8efc 100644 (file)
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -15,30 +15,41 @@ struct device_node;
 #if IS_ENABLED(CONFIG_FIXED_PHY)
 extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier);
 extern int fixed_phy_add(unsigned int irq, int phy_id,
-                        struct fixed_phy_status *status,
-                        int link_gpio);
+                        struct fixed_phy_status *status);
 extern struct phy_device *fixed_phy_register(unsigned int irq,
                                             struct fixed_phy_status *status,
-                                            int link_gpio,
                                             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 *,
                                           struct fixed_phy_status *));
 #else
 static inline int fixed_phy_add(unsigned int irq, int phy_id,
-                               struct fixed_phy_status *status,
-                               int link_gpio)
+                               struct fixed_phy_status *status)
 {
        return -ENODEV;
 }
 static inline struct phy_device *fixed_phy_register(unsigned int irq,
                                                struct fixed_phy_status *status,
-                                               int gpio_link,
                                                struct device_node *np)
 {
        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)
 {
 }