diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 22:01:33 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:39 -0500 |
commit | 4ebb24f707187196937607c60810d42f7112d7aa (patch) | |
tree | 89a92b3f8dd55f3c5e0cfa73fa6446b3d490f3a8 /drivers/sbus/char/uctrl.c | |
parent | 000061245a6797d542854106463b6b20fbdcb12e (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/uctrl.c')
-rw-r--r-- | drivers/sbus/char/uctrl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 1b345be5cc02..ebce9639a26a 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -348,8 +348,7 @@ static void uctrl_get_external_status(struct uctrl_driver *driver) | |||
348 | 348 | ||
349 | } | 349 | } |
350 | 350 | ||
351 | static int __devinit uctrl_probe(struct platform_device *op, | 351 | static int __devinit uctrl_probe(struct platform_device *op) |
352 | const struct of_device_id *match) | ||
353 | { | 352 | { |
354 | struct uctrl_driver *p; | 353 | struct uctrl_driver *p; |
355 | int err = -ENOMEM; | 354 | int err = -ENOMEM; |
@@ -425,7 +424,7 @@ static const struct of_device_id uctrl_match[] = { | |||
425 | }; | 424 | }; |
426 | MODULE_DEVICE_TABLE(of, uctrl_match); | 425 | MODULE_DEVICE_TABLE(of, uctrl_match); |
427 | 426 | ||
428 | static struct of_platform_driver uctrl_driver = { | 427 | static struct platform_driver uctrl_driver = { |
429 | .driver = { | 428 | .driver = { |
430 | .name = "uctrl", | 429 | .name = "uctrl", |
431 | .owner = THIS_MODULE, | 430 | .owner = THIS_MODULE, |
@@ -438,12 +437,12 @@ static struct of_platform_driver uctrl_driver = { | |||
438 | 437 | ||
439 | static int __init uctrl_init(void) | 438 | static int __init uctrl_init(void) |
440 | { | 439 | { |
441 | return of_register_platform_driver(&uctrl_driver); | 440 | return platform_driver_register(&uctrl_driver); |
442 | } | 441 | } |
443 | 442 | ||
444 | static void __exit uctrl_exit(void) | 443 | static void __exit uctrl_exit(void) |
445 | { | 444 | { |
446 | of_unregister_platform_driver(&uctrl_driver); | 445 | platform_driver_unregister(&uctrl_driver); |
447 | } | 446 | } |
448 | 447 | ||
449 | module_init(uctrl_init); | 448 | module_init(uctrl_init); |