From 18e030b526b6381f5e9ed084d1e0e8bd871ba0cd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 26 Mar 2003 21:26:11 -0600 Subject: [PATCH] [PATCH] update qlogic and fdomain drivers to use pcmcia_register_driver --- drivers/scsi/pcmcia/fdomain_stub.c | 37 +++++++++++++++--------------- drivers/scsi/pcmcia/qlogic_stub.c | 25 ++++++++++---------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 51bfb074409cd..c08c59a11fd23 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c @@ -379,26 +379,27 @@ static int fdomain_event(event_t event, int priority, return 0; } /* fdomain_event */ -/*====================================================================*/ - -static int __init init_fdomain_cs(void) { - servinfo_t serv; - DEBUG(0, "%s\n", version); - CardServices(GetCardServicesInfo, &serv); - if (serv.Revision != CS_RELEASE_CODE) { - printk(KERN_NOTICE "fdomain_cs: Card Services release " - "does not match!\n"); - return -1; - } - register_pccard_driver(&dev_info, &fdomain_attach, &fdomain_detach); - return 0; +static struct pcmcia_driver fdomain_cs_driver = { + .owner = THIS_MODULE, + .drv = { + .name = "fdomain_cs", + }, + .attach = fdomain_attach, + .detach = fdomain_detach, +}; + +static int __init init_fdomain_cs(void) +{ + return pcmcia_register_driver(&fdomain_cs_driver); } -static void __exit exit_fdomain_cs(void) { - DEBUG(0, "fdomain_cs: unloading\n"); - unregister_pccard_driver(&dev_info); - while (dev_list != NULL) - fdomain_detach(dev_list); +static void __exit exit_fdomain_cs(void) +{ + pcmcia_unregister_driver(&fdomain_cs_driver); + + /* XXX: this really needs to move into generic code.. */ + while (dev_list != NULL) + fdomain_detach(dev_list); } module_init(init_fdomain_cs); diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index f034280a7007b..40a1cb2c181c0 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -397,25 +397,26 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg return 0; } /* qlogic_event */ -/*====================================================================*/ + +static struct pcmcia_driver qlogic_cs_driver = { + .owner = THIS_MODULE, + .drv = { + .name = "qlogic_cs", + }, + .attach = qlogic_attach, + .detach = qlogic_detach, +}; static int __init init_qlogic_cs(void) { - servinfo_t serv; - DEBUG(0, "%s\n", version); - CardServices(GetCardServicesInfo, &serv); - if (serv.Revision != CS_RELEASE_CODE) { - printk(KERN_NOTICE "qlogic_cs: Card Services release " "does not match!\n"); - return -1; - } - register_pccard_driver(&dev_info, &qlogic_attach, &qlogic_detach); - return 0; + return pcmcia_register_driver(&qlogic_cs_driver); } static void __exit exit_qlogic_cs(void) { - DEBUG(0, "qlogic_cs: unloading\n"); - unregister_pccard_driver(&dev_info); + pcmcia_unregister_driver(&qlogic_cs_driver); + + /* XXX: this really needs to move into generic code.. */ while (dev_list != NULL) qlogic_detach(dev_list); } -- 2.53.0