SATA/PATA: convert drivers/ata/* to use module_platform_driver()
Subsystems (4)
PATCH 1/1 SATA/PATA: convert drivers/ata/* to use module_platform_driver()
This patch converts the drivers in drivers/ata/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.
Cc Viresh Kumar <[email protected]>
Cc Jeff Garzik <[email protected]>
Cc Arnaud Patard <[email protected]>
Cc Alessandro Zummo <[email protected]>
Cc Sylvain Munaut <[email protected]>
Cc Anton Vorontsov <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Mark Miesfeld <[email protected]>
Cc Ashish Kalra <[email protected]>
Cc Paul Mundt <[email protected]>
Signed-off-by Axel Lin <[email protected]>
--- drivers/ata/pata_arasan_cf.c | 12 +----------- drivers/ata/pata_at91.c | 15 +-------------- drivers/ata/pata_imx.c | 12 +----------- drivers/ata/pata_ixp4xx_cf.c | 13 +------------ drivers/ata/pata_mpc52xx.c | 21 +-------------------- drivers/ata/pata_of_platform.c | 12 +----------- drivers/ata/pata_palmld.c | 13 +------------ drivers/ata/pata_platform.c | 12 +----------- drivers/ata/pata_pxa.c | 13 +------------ drivers/ata/pata_rb532_cf.c | 21 ++------------------- drivers/ata/sata_dwc_460ex.c | 13 +------------ drivers/ata/sata_fsl.c | 14 +------------- 12 files changed, 13 insertions(+), 158 deletions(-)
drivers/ata/pata_arasan_cf.c +1 -11
@@ -963,17 +963,7 @@ static struct platform_driver arasan_cf_driver = { }, }; -static int __init arasan_cf_init (void ) -{ -return platform_driver_register (&arasan_cf_driver); -} -module_init (arasan_cf_init); - -static void __exit arasan_cf_exit(void) -{ -platform_driver_unregister (&arasan_cf_driver); -} -module_exit (arasan_cf_exit); +module_platform_driver (arasan_cf_driver);MODULE_AUTHOR ("Viresh Kumar <[email protected]>" );MODULE_DESCRIPTION ("Arasan ATA Compact Flash driver" );
drivers/ata/pata_at91.c +1 -14
@@ -454,20 +454,7 @@ static struct platform_driver pata_at91_driver = { }, }; -static int __init pata_at91_init (void ) -{ -return platform_driver_register (&pata_at91_driver); -} - -static void __exit pata_at91_exit(void) -{ -platform_driver_unregister (&pata_at91_driver); -} - - -module_init (pata_at91_init); -module_exit (pata_at91_exit); - +module_platform_driver (pata_at91_driver);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Driver for CF in True IDE mode on AT91SAM9260 SoC" );
drivers/ata/pata_imx.c +1 -11
@@ -235,17 +235,7 @@ static struct platform_driver pata_imx_driver = { }, }; -static int __init pata_imx_init (void ) -{ -return platform_driver_register (&pata_imx_driver); -} - -static void __exit pata_imx_exit(void) -{ -platform_driver_unregister (&pata_imx_driver); -} -module_init (pata_imx_init); -module_exit (pata_imx_exit); +module_platform_driver (pata_imx_driver);MODULE_AUTHOR ("Arnaud Patard <[email protected]>" );MODULE_DESCRIPTION ("low-level driver for iMX PATA" );
drivers/ata/pata_ixp4xx_cf.c +1 -12
@@ -205,21 +205,10 @@ static struct platform_driver ixp4xx_pata_platform_driver = { .remove = __devexit_p(ixp4xx_pata_remove), }; -static int __init ixp4xx_pata_init (void ) -{ -return platform_driver_register (&ixp4xx_pata_platform_driver); -} - -static void __exit ixp4xx_pata_exit(void) -{ -platform_driver_unregister (&ixp4xx_pata_platform_driver); -} +module_platform_driver (ixp4xx_pata_platform_driver);MODULE_AUTHOR ("Alessandro Zummo <[email protected]>" );MODULE_DESCRIPTION ("low-level driver for ixp4xx Compact Flash PATA" );MODULE_LICENSE ("GPL" );MODULE_VERSION (DRV_VERSION );MODULE_ALIAS ("platform:" DRV_NAME ); - -module_init (ixp4xx_pata_init); -module_exit (ixp4xx_pata_exit);
drivers/ata/pata_mpc52xx.c +1 -20
@@ -897,26 +897,7 @@ static struct platform_driver mpc52xx_ata_of_platform_driver = { }, }; - -/* ======================================================================== */ -/* Module */ -/* ======================================================================== */ - -static int __init -mpc52xx_ata_init (void ) -{ -printk (KERN_INFO "ata: MPC52xx IDE/ATA libata driver\n" ); -return platform_driver_register (&mpc52xx_ata_of_platform_driver); -} - -static void __exit -mpc52xx_ata_exit (void ) -{ -platform_driver_unregister (&mpc52xx_ata_of_platform_driver); -} - -module_init (mpc52xx_ata_init); -module_exit (mpc52xx_ata_exit); +module_platform_driver (mpc52xx_ata_of_platform_driver);MODULE_AUTHOR ("Sylvain Munaut <[email protected]>" );MODULE_DESCRIPTION ("Freescale MPC52xx IDE/ATA libata driver" );
drivers/ata/pata_of_platform.c +1 -11
@@ -101,17 +101,7 @@ static struct platform_driver pata_of_platform_driver = { .remove = __devexit_p(pata_of_platform_remove), }; -static int __init pata_of_platform_init (void ) -{ -return platform_driver_register (&pata_of_platform_driver); -} -module_init (pata_of_platform_init); - -static void __exit pata_of_platform_exit(void) -{ -platform_driver_unregister (&pata_of_platform_driver); -} -module_exit (pata_of_platform_exit); +module_platform_driver (pata_of_platform_driver);MODULE_DESCRIPTION ("OF-platform PATA driver" );MODULE_AUTHOR ("Anton Vorontsov <[email protected]>" );
drivers/ata/pata_palmld.c +1 -12
@@ -132,20 +132,9 @@ static struct platform_driver palmld_pata_platform_driver = { .remove = __devexit_p(palmld_pata_remove), }; -static int __init palmld_pata_init (void ) -{ -return platform_driver_register (&palmld_pata_platform_driver); -} - -static void __exit palmld_pata_exit(void) -{ -platform_driver_unregister (&palmld_pata_platform_driver); -} +module_platform_driver (palmld_pata_platform_driver);MODULE_AUTHOR ("Marek Vasut <[email protected]>" );MODULE_DESCRIPTION ("PalmLD PATA driver" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:" DRV_NAME ); - -module_init (palmld_pata_init); -module_exit (palmld_pata_exit);
drivers/ata/pata_platform.c +1 -11
@@ -256,17 +256,7 @@ static struct platform_driver pata_platform_driver = { }, }; -static int __init pata_platform_init (void ) -{ -return platform_driver_register (&pata_platform_driver); -} - -static void __exit pata_platform_exit(void) -{ -platform_driver_unregister (&pata_platform_driver); -} -module_init (pata_platform_init); -module_exit (pata_platform_exit); +module_platform_driver (pata_platform_driver);module_param (pio_mask, int,0 );
drivers/ata/pata_pxa.c +1 -12
@@ -390,18 +390,7 @@ static struct platform_driver pxa_ata_driver = { }, }; -static int __init pxa_ata_init (void ) -{ -return platform_driver_register (&pxa_ata_driver); -} - -static void __exit pxa_ata_exit(void) -{ -platform_driver_unregister (&pxa_ata_driver); -} - -module_init (pxa_ata_init); -module_exit (pxa_ata_exit); +module_platform_driver (pxa_ata_driver);MODULE_AUTHOR ("Marek Vasut <[email protected]>" );MODULE_DESCRIPTION ("DMA-capable driver for PATA on PXA CPU" );
drivers/ata/pata_rb532_cf.c +2 -19
@@ -188,9 +188,6 @@ static __devexit int rb532_pata_driver_remove(struct platform_device *pdev)return 0 ; } -/* work with hotplug and coldplug */ -MODULE_ALIAS ("platform:" DRV_NAME ); -static struct platform_driver rb532_pata_platform_driver = { .probe = rb532_pata_driver_probe, .remove =__devexit_p (rb532_pata_driver_remove),
@@ -200,27 +197,13 @@ static struct platform_driver rb532_pata_platform_driver = { }, }; -/* ------------------------------------------------------------------------ */ -#define DRV_INFO DRV_DESC " version " DRV_VERSION -static int __init rb532_pata_module_init (void ) -{ - printk(KERN_INFO DRV_INFO "\n"); - - return platform_driver_register(&rb532_pata_platform_driver); -} - -static void __exit rb532_pata_module_exit(void) -{ -platform_driver_unregister (&rb532_pata_platform_driver); -} +module_platform_driver (rb532_pata_platform_driver);MODULE_AUTHOR ("Gabor Juhos <juhosg at openwrt.org>" );MODULE_AUTHOR ("Florian Fainelli <[email protected]>" );MODULE_DESCRIPTION (DRV_DESC );MODULE_VERSION (DRV_VERSION );MODULE_LICENSE ("GPL" ); - -module_init (rb532_pata_module_init); -module_exit (rb532_pata_module_exit); +MODULE_ALIAS ("platform:" DRV_NAME );
drivers/ata/sata_dwc_460ex.c +1 -12
@@ -1777,18 +1777,7 @@ static struct platform_driver sata_dwc_driver = { .remove = sata_dwc_remove, }; -static int __init sata_dwc_init (void ) -{ -return platform_driver_register (&sata_dwc_driver); -} - -static void __exit sata_dwc_exit(void) -{ -platform_driver_unregister (&sata_dwc_driver); -} - -module_init (sata_dwc_init); -module_exit (sata_dwc_exit); +module_platform_driver (sata_dwc_driver);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Mark Miesfeld <[email protected]>" );
drivers/ata/sata_fsl.c +1 -13
@@ -1452,21 +1452,9 @@ static struct platform_driver fsl_sata_driver = {#endif }; -static int __init sata_fsl_init (void ) -{ -platform_driver_register (&fsl_sata_driver); -return 0 ; -} - -static void __exit sata_fsl_exit(void) -{ -platform_driver_unregister (&fsl_sata_driver); -} +module_platform_driver (fsl_sata_driver);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Ashish Kalra, Freescale Semiconductor" );MODULE_DESCRIPTION ("Freescale 3.0Gbps SATA controller low level driver" );MODULE_VERSION ("1.10" ); - -module_init (sata_fsl_init); -module_exit (sata_fsl_exit);
Signature · 1 line
1.7.5.4
Quoted 4 lines
This patch converts the drivers in
drivers/ata/*to use themodule_platform_driver()macro which makes the code smaller and a bit simpler.
Quoted 12 lines
Cc Viresh Kumar <[email protected]>Cc Jeff Garzik <[email protected]>Cc Arnaud Patard <[email protected]>Cc Alessandro Zummo <[email protected]>Cc Sylvain Munaut <[email protected]>Cc Anton Vorontsov <[email protected]>Cc Marek Vasut <[email protected]>Cc Florian Fainelli <[email protected]>Cc Mark Miesfeld <[email protected]>Cc Ashish Kalra <[email protected]>Cc Paul Mundt <[email protected]>Signed-off-by Axel Lin <[email protected]>
For pata_pxa and pata_palmld please add:
Acked-by Marek Vasut <[email protected]>
Quoted 44 lines · Axel Lin
This patch converts the drivers in
drivers/ata/*to use themodule_platform_driver()macro which makes the code smaller and a bit simpler.Cc Viresh Kumar <[email protected]>Cc Jeff Garzik <[email protected]>Cc Arnaud Patard <[email protected]>Cc Alessandro Zummo <[email protected]>Cc Sylvain Munaut <[email protected]>Cc Anton Vorontsov <[email protected]>Cc Marek Vasut <[email protected]>Cc Florian Fainelli <[email protected]>Cc Mark Miesfeld <[email protected]>Cc Ashish Kalra <[email protected]>Cc Paul Mundt <[email protected]>Signed-off-by Axel Lin <[email protected]>--- drivers/ata/pata_arasan_cf.c | 12 +----------- drivers/ata/pata_at91.c | 15 +-------------- drivers/ata/pata_imx.c | 12 +----------- drivers/ata/pata_ixp4xx_cf.c | 13 +------------ drivers/ata/pata_mpc52xx.c | 21 +-------------------- drivers/ata/pata_of_platform.c | 12 +----------- drivers/ata/pata_palmld.c | 13 +------------ drivers/ata/pata_platform.c | 12 +----------- drivers/ata/pata_pxa.c | 13 +------------ drivers/ata/pata_rb532_cf.c | 21 ++------------------- drivers/ata/sata_dwc_460ex.c | 13 +------------ drivers/ata/sata_fsl.c | 14 +------------- 12 files changed, 13 insertions(+), 158 deletions(-)drivers/ata/pata_arasan_cf.c +0
-5@@ -963,17 +963,7 @@ static struct platform_driver arasan_cf_driver = { }, }; -static int __init arasan_cf_init (void ) -{ -return platform_driver_register (&arasan_cf_driver); -} -module_init (arasan_cf_init);
drivers/ata/pata_arasan_cf.c static struct platform_driver arasan_cf_driver = { · line 969
Quoted 10 lines
drivers/ata/pata_arasan_cf.c +1
-6- -static void __exit arasan_cf_exit(void) -{ -platform_driver_unregister (&arasan_cf_driver); -} -module_exit (arasan_cf_exit); +module_platform_driver (arasan_cf_driver);MODULE_AUTHOR ("Viresh Kumar <[email protected]>" );MODULE_DESCRIPTION ("Arasan ATA Compact Flash driver" );
For SPEAr:
Acked-by Viresh Kumar <[email protected]>
Signature · 1 line
viresh
Quoted 8 lines · Viresh Kumar
drivers/ata/pata_arasan_cf.c +0
-0drivers/ata/pata_arasan_cf.c
Quoted 3 lines
index e8574bb..048589f 100644
drivers/ata/pata_arasan_cf.c +0
-0For SPEAr:
Acked-by Viresh Kumar <[email protected]>
Oops!! I meant pata_arasan_cf, not SPEAr.
Signature · 1 line
viresh