[PATCH] kill remaining cardservices version checking
Christoph Hellwig
hch at lst.de
Mon Aug 18 21:43:08 BST 2003
We know we have the right version because we were compiled in the
same kernel tree..
--- 1.69/drivers/net/wireless/wl3501_cs.c Thu Aug 7 12:17:57 2003
+++ edited/drivers/net/wireless/wl3501_cs.c Sun Aug 17 21:32:23 2003
@@ -2342,19 +2342,7 @@
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)
--- 1.1/drivers/pcmcia/au1000_generic.c Mon Jun 23 15:12:26 2003
+++ edited/drivers/pcmcia/au1000_generic.c Sun Aug 17 21:32:57 2003
@@ -136,7 +136,6 @@
static int __init au1000_pcmcia_driver_init(void)
{
- servinfo_t info;
struct pcmcia_init pcmcia_init;
struct pcmcia_state state;
unsigned int i;
@@ -147,13 +146,6 @@
printk(KERN_ERR "Au1x00 PCMCIA 36 bit IO support not enabled\n");
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;
--- 1.14/drivers/pcmcia/hd64465_ss.c Sun Jul 6 06:42:50 2003
+++ edited/drivers/pcmcia/hd64465_ss.c Sun Aug 17 21:33:12 2003
@@ -884,18 +884,8 @@
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))
--- 1.43/drivers/pcmcia/i82365.c Thu Aug 14 19:53:49 2003
+++ edited/drivers/pcmcia/i82365.c Sun Aug 17 21:33:29 2003
@@ -1365,16 +1365,8 @@
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;
--- 1.32/drivers/pcmcia/tcic.c Thu Aug 14 19:53:49 2003
+++ edited/drivers/pcmcia/tcic.c Sun Aug 17 21:33:42 2003
@@ -379,15 +379,6 @@
{
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;
More information about the linux-pcmcia
mailing list