diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-10-14 17:54:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-14 17:54:52 -0400 |
commit | e72701acbe0b35e52d3f04d442837c06b4e64f1c (patch) | |
tree | 2a8edc6952e79c3d2ee3bdf7690ed1a6f2e7bcc6 | |
parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) |
net: Fix OF platform drivers coldplug/hotplug when compiled as modules
Some OF platform drivers are missing module device tables, so they won't
load automatically on boot. This patch fixes the issue by adding proper
MODULE_DEVICE_TABLE() macros to the drivers.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/can/sja1000/sja1000_of_platform.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_mpc52xx_phy.c | 1 | ||||
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 1 | ||||
-rw-r--r-- | drivers/net/fs_enet/mii-bitbang.c | 1 | ||||
-rw-r--r-- | drivers/net/fs_enet/mii-fec.c | 1 | ||||
-rw-r--r-- | drivers/net/fsl_pq_mdio.c | 1 | ||||
-rw-r--r-- | drivers/net/gianfar.c | 4 | ||||
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 2 | ||||
-rw-r--r-- | drivers/net/phy/mdio-gpio.c | 1 |
9 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index 3373560405ba..9dd076a626a5 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c | |||
@@ -213,6 +213,7 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = { | |||
213 | {.compatible = "nxp,sja1000"}, | 213 | {.compatible = "nxp,sja1000"}, |
214 | {}, | 214 | {}, |
215 | }; | 215 | }; |
216 | MODULE_DEVICE_TABLE(of, sja1000_ofp_table); | ||
216 | 217 | ||
217 | static struct of_platform_driver sja1000_ofp_driver = { | 218 | static struct of_platform_driver sja1000_ofp_driver = { |
218 | .owner = THIS_MODULE, | 219 | .owner = THIS_MODULE, |
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index 31e6d62b785d..ee0f3c6d3f88 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c | |||
@@ -155,6 +155,7 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = { | |||
155 | { .compatible = "mpc5200b-fec-phy", }, | 155 | { .compatible = "mpc5200b-fec-phy", }, |
156 | {} | 156 | {} |
157 | }; | 157 | }; |
158 | MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match); | ||
158 | 159 | ||
159 | struct of_platform_driver mpc52xx_fec_mdio_driver = { | 160 | struct of_platform_driver mpc52xx_fec_mdio_driver = { |
160 | .name = "mpc5200b-fec-phy", | 161 | .name = "mpc5200b-fec-phy", |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 2bc2d2b20644..ec2f5034457f 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -1110,6 +1110,7 @@ static struct of_device_id fs_enet_match[] = { | |||
1110 | #endif | 1110 | #endif |
1111 | {} | 1111 | {} |
1112 | }; | 1112 | }; |
1113 | MODULE_DEVICE_TABLE(of, fs_enet_match); | ||
1113 | 1114 | ||
1114 | static struct of_platform_driver fs_enet_driver = { | 1115 | static struct of_platform_driver fs_enet_driver = { |
1115 | .name = "fs_enet", | 1116 | .name = "fs_enet", |
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index 93b481b0e3c7..24ff9f43a62b 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c | |||
@@ -221,6 +221,7 @@ static struct of_device_id fs_enet_mdio_bb_match[] = { | |||
221 | }, | 221 | }, |
222 | {}, | 222 | {}, |
223 | }; | 223 | }; |
224 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match); | ||
224 | 225 | ||
225 | static struct of_platform_driver fs_enet_bb_mdio_driver = { | 226 | static struct of_platform_driver fs_enet_bb_mdio_driver = { |
226 | .name = "fsl-bb-mdio", | 227 | .name = "fsl-bb-mdio", |
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index a2d69c1cd07e..96eba4280c5c 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c | |||
@@ -219,6 +219,7 @@ static struct of_device_id fs_enet_mdio_fec_match[] = { | |||
219 | #endif | 219 | #endif |
220 | {}, | 220 | {}, |
221 | }; | 221 | }; |
222 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match); | ||
222 | 223 | ||
223 | static struct of_platform_driver fs_enet_fec_mdio_driver = { | 224 | static struct of_platform_driver fs_enet_fec_mdio_driver = { |
224 | .name = "fsl-fec-mdio", | 225 | .name = "fsl-fec-mdio", |
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index d167090248e2..6ac464866972 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c | |||
@@ -407,6 +407,7 @@ static struct of_device_id fsl_pq_mdio_match[] = { | |||
407 | }, | 407 | }, |
408 | {}, | 408 | {}, |
409 | }; | 409 | }; |
410 | MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match); | ||
410 | 411 | ||
411 | static struct of_platform_driver fsl_pq_mdio_driver = { | 412 | static struct of_platform_driver fsl_pq_mdio_driver = { |
412 | .name = "fsl-pq_mdio", | 413 | .name = "fsl-pq_mdio", |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 1e5289ffef6f..5bf31f1509c9 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -2325,9 +2325,6 @@ static irqreturn_t gfar_error(int irq, void *dev_id) | |||
2325 | return IRQ_HANDLED; | 2325 | return IRQ_HANDLED; |
2326 | } | 2326 | } |
2327 | 2327 | ||
2328 | /* work with hotplug and coldplug */ | ||
2329 | MODULE_ALIAS("platform:fsl-gianfar"); | ||
2330 | |||
2331 | static struct of_device_id gfar_match[] = | 2328 | static struct of_device_id gfar_match[] = |
2332 | { | 2329 | { |
2333 | { | 2330 | { |
@@ -2336,6 +2333,7 @@ static struct of_device_id gfar_match[] = | |||
2336 | }, | 2333 | }, |
2337 | {}, | 2334 | {}, |
2338 | }; | 2335 | }; |
2336 | MODULE_DEVICE_TABLE(of, gfar_match); | ||
2339 | 2337 | ||
2340 | /* Structure for a device driver */ | 2338 | /* Structure for a device driver */ |
2341 | static struct of_platform_driver gfar_driver = { | 2339 | static struct of_platform_driver gfar_driver = { |
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index c6591cb0aae0..3fae87559791 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -24,6 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/module.h> | ||
27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
28 | #include <linux/string.h> | 29 | #include <linux/string.h> |
29 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
@@ -2988,6 +2989,7 @@ static struct of_device_id emac_match[] = | |||
2988 | }, | 2989 | }, |
2989 | {}, | 2990 | {}, |
2990 | }; | 2991 | }; |
2992 | MODULE_DEVICE_TABLE(of, emac_match); | ||
2991 | 2993 | ||
2992 | static struct of_platform_driver emac_driver = { | 2994 | static struct of_platform_driver emac_driver = { |
2993 | .name = "emac", | 2995 | .name = "emac", |
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index 250e10f2c35b..8659d341e769 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c | |||
@@ -238,6 +238,7 @@ static struct of_device_id mdio_ofgpio_match[] = { | |||
238 | }, | 238 | }, |
239 | {}, | 239 | {}, |
240 | }; | 240 | }; |
241 | MODULE_DEVICE_TABLE(of, mdio_ofgpio_match); | ||
241 | 242 | ||
242 | static struct of_platform_driver mdio_ofgpio_driver = { | 243 | static struct of_platform_driver mdio_ofgpio_driver = { |
243 | .name = "mdio-gpio", | 244 | .name = "mdio-gpio", |