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/ll_temac_main.c | |
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/ll_temac_main.c')
-rw-r--r-- | drivers/net/ll_temac_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index f35554d11441..b7948ccfcf7d 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -952,8 +952,7 @@ static const struct attribute_group temac_attr_group = { | |||
952 | .attrs = temac_device_attrs, | 952 | .attrs = temac_device_attrs, |
953 | }; | 953 | }; |
954 | 954 | ||
955 | static int __devinit | 955 | static int __devinit temac_of_probe(struct platform_device *op) |
956 | temac_of_probe(struct platform_device *op, const struct of_device_id *match) | ||
957 | { | 956 | { |
958 | struct device_node *np; | 957 | struct device_node *np; |
959 | struct temac_local *lp; | 958 | struct temac_local *lp; |
@@ -1123,7 +1122,7 @@ static struct of_device_id temac_of_match[] __devinitdata = { | |||
1123 | }; | 1122 | }; |
1124 | MODULE_DEVICE_TABLE(of, temac_of_match); | 1123 | MODULE_DEVICE_TABLE(of, temac_of_match); |
1125 | 1124 | ||
1126 | static struct of_platform_driver temac_of_driver = { | 1125 | static struct platform_driver temac_of_driver = { |
1127 | .probe = temac_of_probe, | 1126 | .probe = temac_of_probe, |
1128 | .remove = __devexit_p(temac_of_remove), | 1127 | .remove = __devexit_p(temac_of_remove), |
1129 | .driver = { | 1128 | .driver = { |
@@ -1135,13 +1134,13 @@ static struct of_platform_driver temac_of_driver = { | |||
1135 | 1134 | ||
1136 | static int __init temac_init(void) | 1135 | static int __init temac_init(void) |
1137 | { | 1136 | { |
1138 | return of_register_platform_driver(&temac_of_driver); | 1137 | return platform_driver_register(&temac_of_driver); |
1139 | } | 1138 | } |
1140 | module_init(temac_init); | 1139 | module_init(temac_init); |
1141 | 1140 | ||
1142 | static void __exit temac_exit(void) | 1141 | static void __exit temac_exit(void) |
1143 | { | 1142 | { |
1144 | of_unregister_platform_driver(&temac_of_driver); | 1143 | platform_driver_unregister(&temac_of_driver); |
1145 | } | 1144 | } |
1146 | module_exit(temac_exit); | 1145 | module_exit(temac_exit); |
1147 | 1146 | ||