diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 23:02:43 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:44 -0500 |
commit | 18d306d1375696b0e6b5b39e4744d7fa2ad5e170 (patch) | |
tree | 670eac5a75e3b6b0c76903da4d3cf6334d28fe5b /drivers/spi/spi_ppc4xx.c | |
parent | e5263a517688b83861d406223a0f111a6e4116ff (diff) |
dt/spi: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/spi. 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/spi/spi_ppc4xx.c')
-rw-r--r-- | drivers/spi/spi_ppc4xx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c index 80e172d3e72a..2a298c029194 100644 --- a/drivers/spi/spi_ppc4xx.c +++ b/drivers/spi/spi_ppc4xx.c | |||
@@ -390,8 +390,7 @@ static void free_gpios(struct ppc4xx_spi *hw) | |||
390 | /* | 390 | /* |
391 | * platform_device layer stuff... | 391 | * platform_device layer stuff... |
392 | */ | 392 | */ |
393 | static int __init spi_ppc4xx_of_probe(struct platform_device *op, | 393 | static int __init spi_ppc4xx_of_probe(struct platform_device *op) |
394 | const struct of_device_id *match) | ||
395 | { | 394 | { |
396 | struct ppc4xx_spi *hw; | 395 | struct ppc4xx_spi *hw; |
397 | struct spi_master *master; | 396 | struct spi_master *master; |
@@ -586,7 +585,7 @@ static const struct of_device_id spi_ppc4xx_of_match[] = { | |||
586 | 585 | ||
587 | MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match); | 586 | MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match); |
588 | 587 | ||
589 | static struct of_platform_driver spi_ppc4xx_of_driver = { | 588 | static struct platform_driver spi_ppc4xx_of_driver = { |
590 | .probe = spi_ppc4xx_of_probe, | 589 | .probe = spi_ppc4xx_of_probe, |
591 | .remove = __exit_p(spi_ppc4xx_of_remove), | 590 | .remove = __exit_p(spi_ppc4xx_of_remove), |
592 | .driver = { | 591 | .driver = { |
@@ -598,13 +597,13 @@ static struct of_platform_driver spi_ppc4xx_of_driver = { | |||
598 | 597 | ||
599 | static int __init spi_ppc4xx_init(void) | 598 | static int __init spi_ppc4xx_init(void) |
600 | { | 599 | { |
601 | return of_register_platform_driver(&spi_ppc4xx_of_driver); | 600 | return platform_driver_register(&spi_ppc4xx_of_driver); |
602 | } | 601 | } |
603 | module_init(spi_ppc4xx_init); | 602 | module_init(spi_ppc4xx_init); |
604 | 603 | ||
605 | static void __exit spi_ppc4xx_exit(void) | 604 | static void __exit spi_ppc4xx_exit(void) |
606 | { | 605 | { |
607 | of_unregister_platform_driver(&spi_ppc4xx_of_driver); | 606 | platform_driver_unregister(&spi_ppc4xx_of_driver); |
608 | } | 607 | } |
609 | module_exit(spi_ppc4xx_exit); | 608 | module_exit(spi_ppc4xx_exit); |
610 | 609 | ||