aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/core.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/ibm_newemac/core.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/ibm_newemac/core.c')
-rw-r--r--drivers/net/ibm_newemac/core.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 6d9275c52e0..3bb990b6651 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2719,8 +2719,7 @@ static const struct net_device_ops emac_gige_netdev_ops = {
2719 .ndo_change_mtu = emac_change_mtu, 2719 .ndo_change_mtu = emac_change_mtu,
2720}; 2720};
2721 2721
2722static int __devinit emac_probe(struct platform_device *ofdev, 2722static int __devinit emac_probe(struct platform_device *ofdev)
2723 const struct of_device_id *match)
2724{ 2723{
2725 struct net_device *ndev; 2724 struct net_device *ndev;
2726 struct emac_instance *dev; 2725 struct emac_instance *dev;
@@ -2994,7 +2993,7 @@ static struct of_device_id emac_match[] =
2994}; 2993};
2995MODULE_DEVICE_TABLE(of, emac_match); 2994MODULE_DEVICE_TABLE(of, emac_match);
2996 2995
2997static struct of_platform_driver emac_driver = { 2996static struct platform_driver emac_driver = {
2998 .driver = { 2997 .driver = {
2999 .name = "emac", 2998 .name = "emac",
3000 .owner = THIS_MODULE, 2999 .owner = THIS_MODULE,
@@ -3069,7 +3068,7 @@ static int __init emac_init(void)
3069 rc = tah_init(); 3068 rc = tah_init();
3070 if (rc) 3069 if (rc)
3071 goto err_rgmii; 3070 goto err_rgmii;
3072 rc = of_register_platform_driver(&emac_driver); 3071 rc = platform_driver_register(&emac_driver);
3073 if (rc) 3072 if (rc)
3074 goto err_tah; 3073 goto err_tah;
3075 3074
@@ -3091,7 +3090,7 @@ static void __exit emac_exit(void)
3091{ 3090{
3092 int i; 3091 int i;
3093 3092
3094 of_unregister_platform_driver(&emac_driver); 3093 platform_driver_unregister(&emac_driver);
3095 3094
3096 tah_exit(); 3095 tah_exit();
3097 rgmii_exit(); 3096 rgmii_exit();