Skip to contentSkip to conversation

drivers/scsi: use module_pcmcia_driver() in pcmcia drivers

PATCH New Greg KH 1 participant 2 messages Apr 16, 2013

Subsystems (3)
SCSI AHA152X SCSI driver Ninja SCSI-3 / ninja SCSI-32Bi (16bit/CardBus) pcmcia SCSI host adapter driver
lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/2 drivers/scsi: use module_pcmcia_driver() in pcmcia drivers

From: H Hartley Sweeten <[email protected]>

Use the new module_pcmcia_driver() macro to remove the boilerplate module init/exit code in the pcmcia drivers.

Signed-off-by H Hartley Sweeten <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>

---

Note, this needs the module_pcmcia_driver() macro, which is in my char-misc-next branch and will be showing up in 3.10-rc1 - gregkh

 drivers/scsi/pcmcia/aha152x_stub.c | 14 +-------------
 drivers/scsi/pcmcia/fdomain_stub.c | 14 +-------------
 drivers/scsi/pcmcia/nsp_cs.c       | 17 +----------------
 drivers/scsi/pcmcia/qlogic_stub.c  | 13 +------------
 drivers/scsi/pcmcia/sym53c500_cs.c | 16 +---------------
 5 files changed, 5 insertions(+), 69 deletions(-)
drivers/scsi/pcmcia/aha152x_stub.c +1 -13
index 7d1609f..df82a34 100644
@@ -220,16 +220,4 @@ static struct pcmcia_driver aha152x_cs_driver = {
 	.id_table       = aha152x_ids,
 	.resume		= aha152x_resume,
 };
-
-static int __init init_aha152x_cs(void)
-{
-	return pcmcia_register_driver(&aha152x_cs_driver);
-}
-
-static void __exit exit_aha152x_cs(void)
-{
-	pcmcia_unregister_driver(&aha152x_cs_driver);
-}
-
-module_init(init_aha152x_cs);
-module_exit(exit_aha152x_cs);
+module_pcmcia_driver(aha152x_cs_driver);
drivers/scsi/pcmcia/fdomain_stub.c +1 -13
index 714b248..ba84769 100644
@@ -194,16 +194,4 @@ static struct pcmcia_driver fdomain_cs_driver = {
 	.id_table       = fdomain_ids,
 	.resume		= fdomain_resume,
 };
-
-static int __init init_fdomain_cs(void)
-{
-	return pcmcia_register_driver(&fdomain_cs_driver);
-}
-
-static void __exit exit_fdomain_cs(void)
-{
-	pcmcia_unregister_driver(&fdomain_cs_driver);
-}
-
-module_init(init_fdomain_cs);
-module_exit(exit_fdomain_cs);
+module_pcmcia_driver(fdomain_cs_driver);
drivers/scsi/pcmcia/nsp_cs.c +1 -16
index b61a753..76ca00c 100644
@@ -1773,19 +1773,4 @@ static struct pcmcia_driver nsp_driver = {
 	.suspend	= nsp_cs_suspend,
 	.resume		= nsp_cs_resume,
 };
-
-static int __init nsp_cs_init(void)
-{
-	return pcmcia_register_driver(&nsp_driver);
-}
-
-static void __exit nsp_cs_exit(void)
-{
-	pcmcia_unregister_driver(&nsp_driver);
-}
-
-
-module_init(nsp_cs_init)
-module_exit(nsp_cs_exit)
-
-/* end */
+module_pcmcia_driver(nsp_driver);
drivers/scsi/pcmcia/qlogic_stub.c +1 -12
index bcaf89f..8d4fdc2 100644
@@ -300,19 +300,8 @@ static struct pcmcia_driver qlogic_cs_driver = {
 	.id_table       = qlogic_ids,
 	.resume		= qlogic_resume,
 };
-
-static int __init init_qlogic_cs(void)
-{
-	return pcmcia_register_driver(&qlogic_cs_driver);
-}
-
-static void __exit exit_qlogic_cs(void)
-{
-	pcmcia_unregister_driver(&qlogic_cs_driver);
-}
+module_pcmcia_driver(qlogic_cs_driver);
 
 MODULE_AUTHOR("Tom Zerucha, Michael Griffith");
 MODULE_DESCRIPTION("Driver for the PCMCIA Qlogic FAS SCSI controllers");
 MODULE_LICENSE("GPL");
-module_init(init_qlogic_cs);
-module_exit(exit_qlogic_cs);
drivers/scsi/pcmcia/sym53c500_cs.c +1 -15
index f5b5273..55b0b2b 100644
@@ -881,18 +881,4 @@ static struct pcmcia_driver sym53c500_cs_driver = {
 	.id_table       = sym53c500_ids,
 	.resume		= sym53c500_resume,
 };
-
-static int __init
-init_sym53c500_cs(void)
-{
-	return pcmcia_register_driver(&sym53c500_cs_driver);
-}
-
-static void __exit
-exit_sym53c500_cs(void)
-{
-	pcmcia_unregister_driver(&sym53c500_cs_driver);
-}
-
-module_init(init_sym53c500_cs);
-module_exit(exit_sym53c500_cs);
+module_pcmcia_driver(sym53c500_cs_driver);
Signature · 1 line
1.8.2.1.368.g99c2266
author
#1 lore raw

PATCH 2/2 scsi: pcmcia: nsp_cs: remove module init/exit function prototypes

From: H Hartley Sweeten <[email protected]>

This driver now uses the module_pcmcia_driver() macro to supply the init/exit code. The nsp_cs_{init,exit} prototypes should be removed.

Reported-by kbuild test robot <[email protected]>
Signed-off-by H Hartley Sweeten <[email protected]>
Cc YOKOTA Hiroshi <[email protected]>
Cc "James E.J. Bottomley" <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/scsi/pcmcia/nsp_cs.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/scsi/pcmcia/nsp_cs.h +0 -4
index 7fc9a9d..4d4b4f5 100644
@@ -331,10 +331,6 @@ static struct Scsi_Host *nsp_detect(struct scsi_host_template *sht);
 /* Interrupt handler */
 //static irqreturn_t nspintr(int irq, void *dev_id);
 
-/* Module entry point*/
-static int  __init nsp_cs_init(void);
-static void __exit nsp_cs_exit(void);
-
 /* Debug */
 #ifdef NSP_DEBUG
 static void show_command (struct scsi_cmnd *SCpnt);
Signature · 1 line
1.8.2.1.368.g99c2266