Revert "drivers/scsi: use module_pcmcia_driver() in pcmcia drivers"

This reverts commit 3e13ea450b6a4714ee05ba4d61e5b32821cde550.

It should go through the scsi tree instead.

Cc: kbuild test robot <fengguang.wu@intel.com>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index df82a349e969839f536e5e8fb7337eeae19adbc6..7d1609fa233c118e10afdd58463b40dcaad3e56b 100644 (file)
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -220,4 +220,16 @@ static struct pcmcia_driver aha152x_cs_driver = {
        .id_table       = aha152x_ids,
        .resume         = aha152x_resume,
 };
-module_pcmcia_driver(aha152x_cs_driver);
+
+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);

diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index ba84769e849fff28cf880b4cfabfd779eb4af889..714b248f5d5e675bae69c9f4361db060dcce02a6 100644 (file)
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -194,4 +194,16 @@ static struct pcmcia_driver fdomain_cs_driver = {
        .id_table       = fdomain_ids,
        .resume         = fdomain_resume,
 };
-module_pcmcia_driver(fdomain_cs_driver);
+
+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);

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 76ca00cbc11e256ea640cdd14eb39ba203a08703..b61a753eb8960c19659a53fc18cf35d35c2e70f1 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1773,4 +1773,19 @@ static struct pcmcia_driver nsp_driver = {
        .suspend        = nsp_cs_suspend,
        .resume         = nsp_cs_resume,
 };
-module_pcmcia_driver(nsp_driver);
+
+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 */

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 8d4fdc292242d8a8bf28162647af091ed0e3742a..bcaf89fe0c9ed886099925a53d1f2cc27b46f412 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -300,8 +300,19 @@ static struct pcmcia_driver qlogic_cs_driver = {
        .id_table       = qlogic_ids,
        .resume         = qlogic_resume,
 };
-module_pcmcia_driver(qlogic_cs_driver);
+
+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_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);

diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 55b0b2b38a65be4934bc98ef730647b9c5cb2bca..f5b52731abd946949f768c224f950fee2b6693f1 100644 (file)
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -881,4 +881,18 @@ static struct pcmcia_driver sym53c500_cs_driver = {
        .id_table       = sym53c500_ids,
        .resume         = sym53c500_resume,
 };
-module_pcmcia_driver(sym53c500_cs_driver);
+
+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);