diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:05:51 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:44 -0500 |
commit | 74888760d40b3ac9054f9c5fa07b566c0676ba2d (patch) | |
tree | ede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd /drivers/net/fs_enet | |
parent | f07eb223a081b278be02a58394cb5fd66f1a1bbd (diff) |
dt/net: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/net. The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 16 | ||||
-rw-r--r-- | drivers/net/fs_enet/mii-bitbang.c | 9 | ||||
-rw-r--r-- | drivers/net/fs_enet/mii-fec.c | 15 |
3 files changed, 22 insertions, 18 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 7a1f3d0ffa7..24cb953900d 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -998,8 +998,7 @@ static const struct net_device_ops fs_enet_netdev_ops = { | |||
998 | #endif | 998 | #endif |
999 | }; | 999 | }; |
1000 | 1000 | ||
1001 | static int __devinit fs_enet_probe(struct platform_device *ofdev, | 1001 | static int __devinit fs_enet_probe(struct platform_device *ofdev) |
1002 | const struct of_device_id *match) | ||
1003 | { | 1002 | { |
1004 | struct net_device *ndev; | 1003 | struct net_device *ndev; |
1005 | struct fs_enet_private *fep; | 1004 | struct fs_enet_private *fep; |
@@ -1008,11 +1007,14 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev, | |||
1008 | const u8 *mac_addr; | 1007 | const u8 *mac_addr; |
1009 | int privsize, len, ret = -ENODEV; | 1008 | int privsize, len, ret = -ENODEV; |
1010 | 1009 | ||
1010 | if (!ofdev->dev.of_match) | ||
1011 | return -EINVAL; | ||
1012 | |||
1011 | fpi = kzalloc(sizeof(*fpi), GFP_KERNEL); | 1013 | fpi = kzalloc(sizeof(*fpi), GFP_KERNEL); |
1012 | if (!fpi) | 1014 | if (!fpi) |
1013 | return -ENOMEM; | 1015 | return -ENOMEM; |
1014 | 1016 | ||
1015 | if (!IS_FEC(match)) { | 1017 | if (!IS_FEC(ofdev->dev.of_match)) { |
1016 | data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len); | 1018 | data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len); |
1017 | if (!data || len != 4) | 1019 | if (!data || len != 4) |
1018 | goto out_free_fpi; | 1020 | goto out_free_fpi; |
@@ -1047,7 +1049,7 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev, | |||
1047 | fep->dev = &ofdev->dev; | 1049 | fep->dev = &ofdev->dev; |
1048 | fep->ndev = ndev; | 1050 | fep->ndev = ndev; |
1049 | fep->fpi = fpi; | 1051 | fep->fpi = fpi; |
1050 | fep->ops = match->data; | 1052 | fep->ops = ofdev->dev.of_match->data; |
1051 | 1053 | ||
1052 | ret = fep->ops->setup_data(ndev); | 1054 | ret = fep->ops->setup_data(ndev); |
1053 | if (ret) | 1055 | if (ret) |
@@ -1156,7 +1158,7 @@ static struct of_device_id fs_enet_match[] = { | |||
1156 | }; | 1158 | }; |
1157 | MODULE_DEVICE_TABLE(of, fs_enet_match); | 1159 | MODULE_DEVICE_TABLE(of, fs_enet_match); |
1158 | 1160 | ||
1159 | static struct of_platform_driver fs_enet_driver = { | 1161 | static struct platform_driver fs_enet_driver = { |
1160 | .driver = { | 1162 | .driver = { |
1161 | .owner = THIS_MODULE, | 1163 | .owner = THIS_MODULE, |
1162 | .name = "fs_enet", | 1164 | .name = "fs_enet", |
@@ -1168,12 +1170,12 @@ static struct of_platform_driver fs_enet_driver = { | |||
1168 | 1170 | ||
1169 | static int __init fs_init(void) | 1171 | static int __init fs_init(void) |
1170 | { | 1172 | { |
1171 | return of_register_platform_driver(&fs_enet_driver); | 1173 | return platform_driver_register(&fs_enet_driver); |
1172 | } | 1174 | } |
1173 | 1175 | ||
1174 | static void __exit fs_cleanup(void) | 1176 | static void __exit fs_cleanup(void) |
1175 | { | 1177 | { |
1176 | of_unregister_platform_driver(&fs_enet_driver); | 1178 | platform_driver_unregister(&fs_enet_driver); |
1177 | } | 1179 | } |
1178 | 1180 | ||
1179 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1181 | #ifdef CONFIG_NET_POLL_CONTROLLER |
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index 3cda2b51547..ad297544071 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c | |||
@@ -150,8 +150,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus, | |||
150 | return 0; | 150 | return 0; |
151 | } | 151 | } |
152 | 152 | ||
153 | static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev, | 153 | static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev) |
154 | const struct of_device_id *match) | ||
155 | { | 154 | { |
156 | struct mii_bus *new_bus; | 155 | struct mii_bus *new_bus; |
157 | struct bb_info *bitbang; | 156 | struct bb_info *bitbang; |
@@ -223,7 +222,7 @@ static struct of_device_id fs_enet_mdio_bb_match[] = { | |||
223 | }; | 222 | }; |
224 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match); | 223 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match); |
225 | 224 | ||
226 | static struct of_platform_driver fs_enet_bb_mdio_driver = { | 225 | static struct platform_driver fs_enet_bb_mdio_driver = { |
227 | .driver = { | 226 | .driver = { |
228 | .name = "fsl-bb-mdio", | 227 | .name = "fsl-bb-mdio", |
229 | .owner = THIS_MODULE, | 228 | .owner = THIS_MODULE, |
@@ -235,12 +234,12 @@ static struct of_platform_driver fs_enet_bb_mdio_driver = { | |||
235 | 234 | ||
236 | static int fs_enet_mdio_bb_init(void) | 235 | static int fs_enet_mdio_bb_init(void) |
237 | { | 236 | { |
238 | return of_register_platform_driver(&fs_enet_bb_mdio_driver); | 237 | return platform_driver_register(&fs_enet_bb_mdio_driver); |
239 | } | 238 | } |
240 | 239 | ||
241 | static void fs_enet_mdio_bb_exit(void) | 240 | static void fs_enet_mdio_bb_exit(void) |
242 | { | 241 | { |
243 | of_unregister_platform_driver(&fs_enet_bb_mdio_driver); | 242 | platform_driver_unregister(&fs_enet_bb_mdio_driver); |
244 | } | 243 | } |
245 | 244 | ||
246 | module_init(fs_enet_mdio_bb_init); | 245 | module_init(fs_enet_mdio_bb_init); |
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c index dbb9c48623d..7e840d373ab 100644 --- a/drivers/net/fs_enet/mii-fec.c +++ b/drivers/net/fs_enet/mii-fec.c | |||
@@ -101,15 +101,18 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus) | |||
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | 103 | ||
104 | static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev, | 104 | static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev) |
105 | const struct of_device_id *match) | ||
106 | { | 105 | { |
107 | struct resource res; | 106 | struct resource res; |
108 | struct mii_bus *new_bus; | 107 | struct mii_bus *new_bus; |
109 | struct fec_info *fec; | 108 | struct fec_info *fec; |
110 | int (*get_bus_freq)(struct device_node *) = match->data; | 109 | int (*get_bus_freq)(struct device_node *); |
111 | int ret = -ENOMEM, clock, speed; | 110 | int ret = -ENOMEM, clock, speed; |
112 | 111 | ||
112 | if (!ofdev->dev.of_match) | ||
113 | return -EINVAL; | ||
114 | get_bus_freq = ofdev->dev.of_match->data; | ||
115 | |||
113 | new_bus = mdiobus_alloc(); | 116 | new_bus = mdiobus_alloc(); |
114 | if (!new_bus) | 117 | if (!new_bus) |
115 | goto out; | 118 | goto out; |
@@ -221,7 +224,7 @@ static struct of_device_id fs_enet_mdio_fec_match[] = { | |||
221 | }; | 224 | }; |
222 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match); | 225 | MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match); |
223 | 226 | ||
224 | static struct of_platform_driver fs_enet_fec_mdio_driver = { | 227 | static struct platform_driver fs_enet_fec_mdio_driver = { |
225 | .driver = { | 228 | .driver = { |
226 | .name = "fsl-fec-mdio", | 229 | .name = "fsl-fec-mdio", |
227 | .owner = THIS_MODULE, | 230 | .owner = THIS_MODULE, |
@@ -233,12 +236,12 @@ static struct of_platform_driver fs_enet_fec_mdio_driver = { | |||
233 | 236 | ||
234 | static int fs_enet_mdio_fec_init(void) | 237 | static int fs_enet_mdio_fec_init(void) |
235 | { | 238 | { |
236 | return of_register_platform_driver(&fs_enet_fec_mdio_driver); | 239 | return platform_driver_register(&fs_enet_fec_mdio_driver); |
237 | } | 240 | } |
238 | 241 | ||
239 | static void fs_enet_mdio_fec_exit(void) | 242 | static void fs_enet_mdio_fec_exit(void) |
240 | { | 243 | { |
241 | of_unregister_platform_driver(&fs_enet_fec_mdio_driver); | 244 | platform_driver_unregister(&fs_enet_fec_mdio_driver); |
242 | } | 245 | } |
243 | 246 | ||
244 | module_init(fs_enet_mdio_fec_init); | 247 | module_init(fs_enet_mdio_fec_init); |