diff options
Diffstat (limited to 'drivers/dma/ppc4xx/adma.c')
-rw-r--r-- | drivers/dma/ppc4xx/adma.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index cef584533ee8..3b0247e74cc4 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c | |||
@@ -4393,8 +4393,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, | |||
4393 | /** | 4393 | /** |
4394 | * ppc440spe_adma_probe - probe the asynch device | 4394 | * ppc440spe_adma_probe - probe the asynch device |
4395 | */ | 4395 | */ |
4396 | static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev, | 4396 | static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev) |
4397 | const struct of_device_id *match) | ||
4398 | { | 4397 | { |
4399 | struct device_node *np = ofdev->dev.of_node; | 4398 | struct device_node *np = ofdev->dev.of_node; |
4400 | struct resource res; | 4399 | struct resource res; |
@@ -4944,7 +4943,7 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = { | |||
4944 | }; | 4943 | }; |
4945 | MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match); | 4944 | MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match); |
4946 | 4945 | ||
4947 | static struct of_platform_driver ppc440spe_adma_driver = { | 4946 | static struct platform_driver ppc440spe_adma_driver = { |
4948 | .probe = ppc440spe_adma_probe, | 4947 | .probe = ppc440spe_adma_probe, |
4949 | .remove = __devexit_p(ppc440spe_adma_remove), | 4948 | .remove = __devexit_p(ppc440spe_adma_remove), |
4950 | .driver = { | 4949 | .driver = { |
@@ -4962,7 +4961,7 @@ static __init int ppc440spe_adma_init(void) | |||
4962 | if (ret) | 4961 | if (ret) |
4963 | return ret; | 4962 | return ret; |
4964 | 4963 | ||
4965 | ret = of_register_platform_driver(&ppc440spe_adma_driver); | 4964 | ret = platform_driver_register(&ppc440spe_adma_driver); |
4966 | if (ret) { | 4965 | if (ret) { |
4967 | pr_err("%s: failed to register platform driver\n", | 4966 | pr_err("%s: failed to register platform driver\n", |
4968 | __func__); | 4967 | __func__); |
@@ -4996,7 +4995,7 @@ out_dev: | |||
4996 | /* User will not be able to enable h/w RAID-6 */ | 4995 | /* User will not be able to enable h/w RAID-6 */ |
4997 | pr_err("%s: failed to create RAID-6 driver interface\n", | 4996 | pr_err("%s: failed to create RAID-6 driver interface\n", |
4998 | __func__); | 4997 | __func__); |
4999 | of_unregister_platform_driver(&ppc440spe_adma_driver); | 4998 | platform_driver_unregister(&ppc440spe_adma_driver); |
5000 | out_reg: | 4999 | out_reg: |
5001 | dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len); | 5000 | dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len); |
5002 | kfree(ppc440spe_dma_fifo_buf); | 5001 | kfree(ppc440spe_dma_fifo_buf); |
@@ -5011,7 +5010,7 @@ static void __exit ppc440spe_adma_exit(void) | |||
5011 | &driver_attr_enable); | 5010 | &driver_attr_enable); |
5012 | driver_remove_file(&ppc440spe_adma_driver.driver, | 5011 | driver_remove_file(&ppc440spe_adma_driver.driver, |
5013 | &driver_attr_devices); | 5012 | &driver_attr_devices); |
5014 | of_unregister_platform_driver(&ppc440spe_adma_driver); | 5013 | platform_driver_unregister(&ppc440spe_adma_driver); |
5015 | dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len); | 5014 | dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len); |
5016 | kfree(ppc440spe_dma_fifo_buf); | 5015 | kfree(ppc440spe_dma_fifo_buf); |
5017 | } | 5016 | } |