]> git.neil.brown.name Git - history.git/commitdiff
[PCMCIA] kill remaining cardservices version checking
authorChristoph Hellwig <hch@de.rmk.(none)>
Tue, 19 Aug 2003 16:26:26 +0000 (17:26 +0100)
committerRussell King <rmk@flint.arm.linux.org.uk>
Tue, 19 Aug 2003 16:26:26 +0000 (17:26 +0100)
We know we have the right version because we were compiled in the
same kernel tree..

drivers/net/wireless/wl3501_cs.c
drivers/pcmcia/au1000_generic.c
drivers/pcmcia/hd64465_ss.c
drivers/pcmcia/i82365.c
drivers/pcmcia/tcic.c

index 32a69f9eb6e20dd764b94904ea6d539ae985187f..0bb13a6a50b2a118c2082e19bceb6c9dd1ada19c 100644 (file)
@@ -2342,19 +2342,7 @@ static struct pcmcia_driver wl3501_driver = {
 
 static int __init wl3501_init_module(void)
 {
-       servinfo_t serv;
-
-       dprintk(0, ": loading");
-       CardServices(GetCardServicesInfo, &serv);
-       if (serv.Revision != CS_RELEASE_CODE) {
-               printk(KERN_NOTICE
-                      "wl3501_cs: Card Services release does not match!\n"
-                      "Compiled with 0x%x, but current is 0x%lx\n",
-                      CS_RELEASE_CODE, (unsigned long)serv.Revision);
-               /* return -1; */
-       }
-       pcmcia_register_driver(&wl3501_driver);
-       return 0;
+       return pcmcia_register_driver(&wl3501_driver);
 }
 
 static void __exit wl3501_exit_module(void)
index 0db1c0254cc5ac1bc779e3c3fc4f4c302d5b368b..2ed4909abec31c50b279b64833713d01ed2cd762 100644 (file)
@@ -136,7 +136,6 @@ static spinlock_t pcmcia_lock = SPIN_LOCK_UNLOCKED;
 
 static int __init au1000_pcmcia_driver_init(void)
 {
-       servinfo_t info;
        struct pcmcia_init pcmcia_init;
        struct pcmcia_state state;
        unsigned int i;
@@ -148,13 +147,6 @@ static int __init au1000_pcmcia_driver_init(void)
        return -1;
 #endif
 
-       CardServices(GetCardServicesInfo, &info);
-
-       if(info.Revision!=CS_RELEASE_CODE){
-               printk(KERN_ERR "Card Services release codes do not match\n");
-               return -1;
-       }
-
 #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500)
        pcmcia_low_level=&pb1x00_pcmcia_ops;
 #else
index 4346660c30fc7afa73752800da28999176597de1..f208affccf5065fcf317338f0b948d244b4afad1 100644 (file)
@@ -884,19 +884,9 @@ static struct platform_device hd64465_device = {
 
 static int __init init_hs(void)
 {
-       servinfo_t serv;
        int i;
        unsigned short v;
 
-       /*
-        * Check API version
-        */
-       pcmcia_get_card_services_info(&serv);
-       if (serv.Revision != CS_RELEASE_CODE) {
-           printk(KERN_NOTICE MODNAME ": Card Services release does not match!\n");
-           return -ENODEV;
-       }
-
 /*     hd64465_io_debug = 1; */
        if (driver_register(&hd64465_driver))
                return -EINVAL;
index 8b72c5833387dd0fda9549315d07c68c15dcc785..cdef47ddd633f3a5c65e5107033f3f1115cabc29 100644 (file)
@@ -1368,16 +1368,8 @@ static struct platform_device i82365_device = {
 
 static int __init init_i82365(void)
 {
-    servinfo_t serv;
     int i, ret;
 
-    pcmcia_get_card_services_info(&serv);
-    if (serv.Revision != CS_RELEASE_CODE) {
-       printk(KERN_NOTICE "i82365: Card Services release "
-              "does not match!\n");
-       return -1;
-    }
-    DEBUG(0, "%s\n", version);
     if (driver_register(&i82365_driver))
        return -1;
 
index 762da4e3715b4d7aa72caf7597d235ba761eb9e0..7b7a84b81bb55c69a16fa9f01e153d9b2e6de368 100644 (file)
@@ -382,15 +382,6 @@ static int __init init_tcic(void)
 {
     int i, sock, ret = 0;
     u_int mask, scan;
-    servinfo_t serv;
-
-    DEBUG(0, "%s\n", version);
-    pcmcia_get_card_services_info(&serv);
-    if (serv.Revision != CS_RELEASE_CODE) {
-       printk(KERN_NOTICE "tcic: Card Services release "
-              "does not match!\n");
-       return -1;
-    }
 
     if (driver_register(&tcic_driver))
        return -1;