aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/envctrl.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-22 22:01:33 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 03:36:39 -0500
commit4ebb24f707187196937607c60810d42f7112d7aa (patch)
tree89a92b3f8dd55f3c5e0cfa73fa6446b3d490f3a8 /drivers/sbus/char/envctrl.c
parent000061245a6797d542854106463b6b20fbdcb12e (diff)
dt/sparc: Eliminate users of of_platform_{,un}register_driver
Get rid of old users of of_platform_driver in arch/sparc. Most of_platform_driver users can be converted to use the platform_bus directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
-rw-r--r--drivers/sbus/char/envctrl.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 8ce414e39489..be7b4e56154f 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1028,8 +1028,7 @@ static int kenvctrld(void *__unused)
1028 return 0; 1028 return 0;
1029} 1029}
1030 1030
1031static int __devinit envctrl_probe(struct platform_device *op, 1031static int __devinit envctrl_probe(struct platform_device *op)
1032 const struct of_device_id *match)
1033{ 1032{
1034 struct device_node *dp; 1033 struct device_node *dp;
1035 int index, err; 1034 int index, err;
@@ -1129,7 +1128,7 @@ static const struct of_device_id envctrl_match[] = {
1129}; 1128};
1130MODULE_DEVICE_TABLE(of, envctrl_match); 1129MODULE_DEVICE_TABLE(of, envctrl_match);
1131 1130
1132static struct of_platform_driver envctrl_driver = { 1131static struct platform_driver envctrl_driver = {
1133 .driver = { 1132 .driver = {
1134 .name = DRIVER_NAME, 1133 .name = DRIVER_NAME,
1135 .owner = THIS_MODULE, 1134 .owner = THIS_MODULE,
@@ -1141,12 +1140,12 @@ static struct of_platform_driver envctrl_driver = {
1141 1140
1142static int __init envctrl_init(void) 1141static int __init envctrl_init(void)
1143{ 1142{
1144 return of_register_platform_driver(&envctrl_driver); 1143 return platform_driver_register(&envctrl_driver);
1145} 1144}
1146 1145
1147static void __exit envctrl_exit(void) 1146static void __exit envctrl_exit(void)
1148{ 1147{
1149 of_unregister_platform_driver(&envctrl_driver); 1148 platform_driver_unregister(&envctrl_driver);
1150} 1149}
1151 1150
1152module_init(envctrl_init); 1151module_init(envctrl_init);