1 files changed, 26 insertions, 0 deletions

diff --git a/include/linux/phy.h b/include/linux/phy.h
index d090cfcaa167..22af8f8f5802 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -433,6 +433,7 @@ struct phy_device {
  *   by this PHY
  * flags: A bitfield defining certain other features this PHY
  *   supports (like interrupts)
+ * driver_data: static driver data
  *
  * The drivers must implement config_aneg and read_status.  All
  * other functions are optional. Note that none of these
@@ -448,6 +449,7 @@ struct phy_driver {
         unsigned int phy_id_mask;
         u32 features;
         u32 flags;
+        const void *driver_data;
 
         /*
          * Called to issue a PHY software reset
@@ -772,4 +774,28 @@ int __init mdio_bus_init(void);
 void mdio_bus_exit(void);
 
 extern struct bus_type mdio_bus_type;
+
+/**
+ * module_phy_driver() - Helper macro for registering PHY drivers
+ * @__phy_drivers: array of PHY drivers to register
+ *
+ * Helper macro for PHY drivers which do not do anything special in module
+ * init/exit. Each module may only use this macro once, and calling it
+ * replaces module_init() and module_exit().
+ */
+#define phy_module_driver(__phy_drivers, __count)                       \
+static int __init phy_module_init(void)                                 \
+{                                                                       \
+        return phy_drivers_register(__phy_drivers, __count);            \
+}                                                                       \
+module_init(phy_module_init);                                           \
+static void __exit phy_module_exit(void)                                \
+{                                                                       \
+        phy_drivers_unregister(__phy_drivers, __count);                 \
+}                                                                       \
+module_exit(phy_module_exit)
+
+#define module_phy_driver(__phy_drivers)                                \
+        phy_module_driver(__phy_drivers, ARRAY_SIZE(__phy_drivers))
+
 #endif /* __PHY_H */