scsi: convert drivers/scsi/* to use module_platform_driver()

PATCH In review Axel Lin 2 participants 2 messages Nov 26, 2011 – Nov 28, 2011 SCSI

Share & tools

Axel Lin

author

2011-11-26 13:52 UTC #0 lore raw

PATCH 1/1 scsi: convert drivers/scsi/* to use module_platform_driver()

This patch converts the drivers in drivers/scsi/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

Cc Thomas Bogendoerfer <[email protected]>

Cc Finn Thain <[email protected]>

Cc "David S. Miller" <[email protected]>

Cc Ralf Baechle <[email protected]>

Signed-off-by Axel Lin <[email protected]>

---
 drivers/scsi/jazz_esp.c   |   17 ++---------------
 drivers/scsi/mac_esp.c    |   13 +------------
 drivers/scsi/qlogicpti.c  |   13 +------------
 drivers/scsi/sgiwd93.c    |   13 +------------
 drivers/scsi/sni_53c710.c |   13 +------------
 drivers/scsi/sun3x_esp.c  |   13 +------------
 drivers/scsi/sun_esp.c    |   13 +------------
 7 files changed, 8 insertions(+), 87 deletions(-)

drivers/scsi/jazz_esp.c +2 ~~-15~~

index 08e26d4..5c999ac 100644
@@ -218,9 +218,6 @@ static int __devexit esp_jazz_remove(struct platform_device *dev)
 	return 0;
 }
 
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:jazz_esp");
-
 static struct platform_driver esp_jazz_driver = {
 	.probe		= esp_jazz_probe,
 	.remove		= __devexit_p(esp_jazz_remove),

@@ -230,20 +227,10 @@ static struct platform_driver esp_jazz_driver = {
 	},
 };
 
-static int __init jazz_esp_init(void)
-{
-	return platform_driver_register(&esp_jazz_driver);
-}
-
-static void __exit jazz_esp_exit(void)
-{
-	platform_driver_unregister(&esp_jazz_driver);
-}
+module_platform_driver(esp_jazz_driver);
 
 MODULE_DESCRIPTION("JAZZ ESP SCSI driver");
 MODULE_AUTHOR("Thomas Bogendoerfer ([email protected])");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(jazz_esp_init);
-module_exit(jazz_esp_exit);
+MODULE_ALIAS("platform:jazz_esp");

drivers/scsi/mac_esp.c +1 ~~-12~~

index 4ceeace..1246c63 100644
@@ -622,21 +622,10 @@ static struct platform_driver esp_mac_driver = {
 	},
 };
 
-static int __init mac_esp_init(void)
-{
-	return platform_driver_register(&esp_mac_driver);
-}
-
-static void __exit mac_esp_exit(void)
-{
-	platform_driver_unregister(&esp_mac_driver);
-}
+module_platform_driver(esp_mac_driver);
 
 MODULE_DESCRIPTION("Mac ESP SCSI driver");
 MODULE_AUTHOR("Finn Thain <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DRV_VERSION);
 MODULE_ALIAS("platform:" DRV_MODULE_NAME);
-
-module_init(mac_esp_init);
-module_exit(mac_esp_exit);

drivers/scsi/qlogicpti.c +1 ~~-12~~

index e40dc1c..c2b19a4 100644
@@ -1474,21 +1474,10 @@ static struct platform_driver qpti_sbus_driver = {
 	.remove		= __devexit_p(qpti_sbus_remove),
 };
 
-static int __init qpti_init(void)
-{
-	return platform_driver_register(&qpti_sbus_driver);
-}
-
-static void __exit qpti_exit(void)
-{
-	platform_driver_unregister(&qpti_sbus_driver);
-}
+module_platform_driver(qpti_sbus_driver);
 
 MODULE_DESCRIPTION("QlogicISP SBUS driver");
 MODULE_AUTHOR("David S. Miller ([email protected])");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("2.1");
 MODULE_FIRMWARE("qlogic/isp1000.bin");
-
-module_init(qpti_init);
-module_exit(qpti_exit);

drivers/scsi/sgiwd93.c +1 ~~-12~~

index 3a9d85c..c8b0b53 100644
@@ -319,18 +319,7 @@ static struct platform_driver sgiwd93_driver = {
 	}
 };
 
-static int __init sgiwd93_module_init(void)
-{
-	return platform_driver_register(&sgiwd93_driver);
-}
-
-static void __exit sgiwd93_module_exit(void)
-{
-	return platform_driver_unregister(&sgiwd93_driver);
-}
-
-module_init(sgiwd93_module_init);
-module_exit(sgiwd93_module_exit);
+module_platform_driver(sgiwd93_driver);
 
 MODULE_DESCRIPTION("SGI WD33C93 driver");
 MODULE_AUTHOR("Ralf Baechle <[email protected]>");

drivers/scsi/sni_53c710.c +1 ~~-12~~

index 9acc2b2..8317752 100644
@@ -141,15 +141,4 @@ static struct platform_driver snirm710_driver = {
 	},
 };
 
-static int __init snirm710_init(void)
-{
-	return platform_driver_register(&snirm710_driver);
-}
-
-static void __exit snirm710_exit(void)
-{
-	platform_driver_unregister(&snirm710_driver);
-}
-
-module_init(snirm710_init);
-module_exit(snirm710_exit);
+module_platform_driver(snirm710_driver);

drivers/scsi/sun3x_esp.c +1 ~~-12~~

index 0621037..a7f93a2 100644
@@ -299,21 +299,10 @@ static struct platform_driver esp_sun3x_driver = {
 	},
 };
 
-static int __init sun3x_esp_init(void)
-{
-	return platform_driver_register(&esp_sun3x_driver);
-}
-
-static void __exit sun3x_esp_exit(void)
-{
-	platform_driver_unregister(&esp_sun3x_driver);
-}
+module_platform_driver(esp_sun3x_driver);
 
 MODULE_DESCRIPTION("Sun3x ESP SCSI driver");
 MODULE_AUTHOR("Thomas Bogendoerfer ([email protected])");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(sun3x_esp_init);
-module_exit(sun3x_esp_exit);
 MODULE_ALIAS("platform:sun3x_esp");

drivers/scsi/sun_esp.c +1 ~~-12~~

index 676fe9a..a53f5cf 100644
@@ -642,20 +642,9 @@ static struct platform_driver esp_sbus_driver = {
 	.remove		= __devexit_p(esp_sbus_remove),
 };
 
-static int __init sunesp_init(void)
-{
-	return platform_driver_register(&esp_sbus_driver);
-}
-
-static void __exit sunesp_exit(void)
-{
-	platform_driver_unregister(&esp_sbus_driver);
-}
+module_platform_driver(esp_sbus_driver);
 
 MODULE_DESCRIPTION("Sun ESP SCSI driver");
 MODULE_AUTHOR("David S. Miller ([email protected])");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(sunesp_init);
-module_exit(sunesp_exit);

Signature · 1 line

1.7.5.4

Finn Thain

2011-11-28 12:49 UTC #1 lore raw

Quoted 3 lines · Axel Lin

This patch converts the drivers in drivers/scsi/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

...

Quoted 2 lines

-static int __init jazz_esp_init(void)

...

Quoted 1 line

+module_platform_driver(esp_jazz_driver);

Doesn't this transform "jazz_esp_init" into "jazz_esp_driver_init"?

If that's the convention, it seems odd that the module_platform_driver macro doesn't do it...

Finn