diff options
Diffstat (limited to 'drivers/spi/mpc52xx_spi.c')
-rw-r--r-- | drivers/spi/mpc52xx_spi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index 84439f655601..015a974bed72 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c | |||
@@ -390,8 +390,7 @@ static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m) | |||
390 | /* | 390 | /* |
391 | * OF Platform Bus Binding | 391 | * OF Platform Bus Binding |
392 | */ | 392 | */ |
393 | static int __devinit mpc52xx_spi_probe(struct platform_device *op, | 393 | static int __devinit mpc52xx_spi_probe(struct platform_device *op) |
394 | const struct of_device_id *match) | ||
395 | { | 394 | { |
396 | struct spi_master *master; | 395 | struct spi_master *master; |
397 | struct mpc52xx_spi *ms; | 396 | struct mpc52xx_spi *ms; |
@@ -556,7 +555,7 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = { | |||
556 | }; | 555 | }; |
557 | MODULE_DEVICE_TABLE(of, mpc52xx_spi_match); | 556 | MODULE_DEVICE_TABLE(of, mpc52xx_spi_match); |
558 | 557 | ||
559 | static struct of_platform_driver mpc52xx_spi_of_driver = { | 558 | static struct platform_driver mpc52xx_spi_of_driver = { |
560 | .driver = { | 559 | .driver = { |
561 | .name = "mpc52xx-spi", | 560 | .name = "mpc52xx-spi", |
562 | .owner = THIS_MODULE, | 561 | .owner = THIS_MODULE, |
@@ -568,13 +567,13 @@ static struct of_platform_driver mpc52xx_spi_of_driver = { | |||
568 | 567 | ||
569 | static int __init mpc52xx_spi_init(void) | 568 | static int __init mpc52xx_spi_init(void) |
570 | { | 569 | { |
571 | return of_register_platform_driver(&mpc52xx_spi_of_driver); | 570 | return platform_driver_register(&mpc52xx_spi_of_driver); |
572 | } | 571 | } |
573 | module_init(mpc52xx_spi_init); | 572 | module_init(mpc52xx_spi_init); |
574 | 573 | ||
575 | static void __exit mpc52xx_spi_exit(void) | 574 | static void __exit mpc52xx_spi_exit(void) |
576 | { | 575 | { |
577 | of_unregister_platform_driver(&mpc52xx_spi_of_driver); | 576 | platform_driver_unregister(&mpc52xx_spi_of_driver); |
578 | } | 577 | } |
579 | module_exit(mpc52xx_spi_exit); | 578 | module_exit(mpc52xx_spi_exit); |
580 | 579 | ||