aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fec_mpc52xx.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-22 23:05:51 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 15:22:44 -0500
commit74888760d40b3ac9054f9c5fa07b566c0676ba2d (patch)
treeede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd /drivers/net/fec_mpc52xx.c
parentf07eb223a081b278be02a58394cb5fd66f1a1bbd (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/fec_mpc52xx.c')
-rw-r--r--drivers/net/fec_mpc52xx.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 50c1213f61fe..9f81b1ac130e 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -840,8 +840,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = {
840/* OF Driver */ 840/* OF Driver */
841/* ======================================================================== */ 841/* ======================================================================== */
842 842
843static int __devinit 843static int __devinit mpc52xx_fec_probe(struct platform_device *op)
844mpc52xx_fec_probe(struct platform_device *op, const struct of_device_id *match)
845{ 844{
846 int rv; 845 int rv;
847 struct net_device *ndev; 846 struct net_device *ndev;
@@ -1049,7 +1048,7 @@ static struct of_device_id mpc52xx_fec_match[] = {
1049 1048
1050MODULE_DEVICE_TABLE(of, mpc52xx_fec_match); 1049MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
1051 1050
1052static struct of_platform_driver mpc52xx_fec_driver = { 1051static struct platform_driver mpc52xx_fec_driver = {
1053 .driver = { 1052 .driver = {
1054 .name = DRIVER_NAME, 1053 .name = DRIVER_NAME,
1055 .owner = THIS_MODULE, 1054 .owner = THIS_MODULE,
@@ -1073,21 +1072,21 @@ mpc52xx_fec_init(void)
1073{ 1072{
1074#ifdef CONFIG_FEC_MPC52xx_MDIO 1073#ifdef CONFIG_FEC_MPC52xx_MDIO
1075 int ret; 1074 int ret;
1076 ret = of_register_platform_driver(&mpc52xx_fec_mdio_driver); 1075 ret = platform_driver_register(&mpc52xx_fec_mdio_driver);
1077 if (ret) { 1076 if (ret) {
1078 printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n"); 1077 printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n");
1079 return ret; 1078 return ret;
1080 } 1079 }
1081#endif 1080#endif
1082 return of_register_platform_driver(&mpc52xx_fec_driver); 1081 return platform_driver_register(&mpc52xx_fec_driver);
1083} 1082}
1084 1083
1085static void __exit 1084static void __exit
1086mpc52xx_fec_exit(void) 1085mpc52xx_fec_exit(void)
1087{ 1086{
1088 of_unregister_platform_driver(&mpc52xx_fec_driver); 1087 platform_driver_unregister(&mpc52xx_fec_driver);
1089#ifdef CONFIG_FEC_MPC52xx_MDIO 1088#ifdef CONFIG_FEC_MPC52xx_MDIO
1090 of_unregister_platform_driver(&mpc52xx_fec_mdio_driver); 1089 platform_driver_unregister(&mpc52xx_fec_mdio_driver);
1091#endif 1090#endif
1092} 1091}
1093 1092