From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Wed, 2 Nov 2005 00:21:28 +0000 (+0000)
Subject: Patch from abbotti@mev.co.uk (Ian Abbott):
X-Git-Tag: r0_7_71~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f1f4a5e948b1951e0906af3911182f3c9f938f3;p=comedi.git

Patch from abbotti@mev.co.uk (Ian Abbott):

The following drivers do not compile for 2.6.13 upwards due to the removal of
the pcmcia_get_card_services_info function, servinfo_t typedef and
CS_RELEASE_CODE macro:

 cb_das16_cs
 das08_cs
 ni_daq_dio24
 ni_labpc_cs
 ni_mio_cs
 quatech_daqp_cs

I think the best solution is to remove the offending code altogether along with
the #include <pcmcia/version.h> lines as CS_RELEASE_CODE has had the same value
since at least 2.4.0 and Comedi doesn't support earlier kernels anymore.
---

diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index c654bc4f..ca771579 100644
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -35,7 +35,6 @@ Status: experimental
 #include <linux/delay.h>
 #include <linux/pci.h>
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -1155,15 +1154,7 @@ struct pcmcia_driver das16cs_driver =
 
 static int __init init_das16cs_pcmcia_cs(void)
 {
-	servinfo_t serv;
 	DEBUG(0, "%s\n", version);
-	pcmcia_get_card_services_info(&serv);
-	if (serv.Revision != CS_RELEASE_CODE)
-	{
-		printk(KERN_NOTICE "das16cs: Card Services release "
-			"does not match!\n");
-		//return -1;
-	}
 	pcmcia_register_driver(&das16cs_driver);
 	return 0;
 }
diff --git a/comedi/drivers/das08_cs.c b/comedi/drivers/das08_cs.c
index f9af08fb..aa73f038 100644
--- a/comedi/drivers/das08_cs.c
+++ b/comedi/drivers/das08_cs.c
@@ -48,7 +48,6 @@ Command support does not exist, but could be added for this board.
 #include "das08.h"
 
 // pcmcia includes
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -671,15 +670,7 @@ struct pcmcia_driver das08_cs_driver =
 
 static int __init init_das08_pcmcia_cs(void)
 {
-	servinfo_t serv;
 	DEBUG(0, "%s\n", version);
-	pcmcia_get_card_services_info(&serv);
-	if (serv.Revision != CS_RELEASE_CODE)
-	{
-		printk(KERN_NOTICE "das08: Card Services release "
-			"does not match!\n");
-		return -1;
-	}
 	pcmcia_register_driver(&das08_cs_driver);
 	return 0;
 }
diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c
index 788e99eb..1ef146e6 100644
--- a/comedi/drivers/ni_daq_dio24.c
+++ b/comedi/drivers/ni_daq_dio24.c
@@ -47,7 +47,6 @@ the PCMCIA interface.
 
 #include "8255.h"
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -800,15 +799,8 @@ struct pcmcia_driver dio24_cs_driver =
 
 static int __init init_dio24_cs(void)
 {
-    servinfo_t serv;
     printk("ni_daq_dio24: HOLA SOY YO!\n");
     DEBUG(0, "%s\n", version);
-	pcmcia_get_card_services_info(&serv);
-    if (serv.Revision != CS_RELEASE_CODE) {
-		printk(KERN_NOTICE "ni_daq_dio24: Card Services release "
-			"does not match! Vaya putada\n");
-		return -1;
-    }
 	pcmcia_register_driver(&dio24_cs_driver);
     return 0;
 }
diff --git a/comedi/drivers/ni_labpc_cs.c b/comedi/drivers/ni_labpc_cs.c
index 3c22f3f7..550977c1 100644
--- a/comedi/drivers/ni_labpc_cs.c
+++ b/comedi/drivers/ni_labpc_cs.c
@@ -72,7 +72,6 @@ NI manuals:
 #include "comedi_fc.h"
 #include "ni_labpc.h"
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -723,14 +722,7 @@ struct pcmcia_driver labpc_cs_driver =
 
 static int __init init_labpc_cs(void)
 {
-    servinfo_t serv;
     DEBUG(0, "%s\n", version);
-    pcmcia_get_card_services_info(&serv);
-    if (serv.Revision != CS_RELEASE_CODE) {
-	printk(KERN_NOTICE "ni_labpc: Card Services release "
-	       "does not match!\n");
-	return -1;
-    }
 	pcmcia_register_driver(&labpc_cs_driver);
     return 0;
 }
diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index 1d309fcd..acf18c08 100644
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -49,7 +49,6 @@ See the notes in the ni_atmio.o driver.
 #include "ni_stc.h"
 #include "8255.h"
 
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -622,14 +621,6 @@ struct pcmcia_driver ni_mio_cs_driver =
 
 int init_module(void)
 {
-	servinfo_t serv;
-
-	pcmcia_get_card_services_info(&serv);
-	if(serv.Revision != CS_RELEASE_CODE){
-		printk(KERN_NOTICE "mio_cs: Card Services release "
-			"does not match!\n");
-		//return -EPERM; /* XXX what to return? */
-	}
 	pcmcia_register_driver(&ni_mio_cs_driver);
 	comedi_driver_register(&driver_ni_mio_cs);
 	return 0;
diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index 6b0cebef..9e75bf9e 100644
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -50,7 +50,6 @@ Devices: [Quatech] DAQP-208 (daqp), DAQP-308
 #include <linux/comedidev.h>
 
 #include <linux/version.h>
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
@@ -1531,14 +1530,7 @@ struct pcmcia_driver daqp_cs_driver =
 
 int init_module(void)
 {
-    servinfo_t serv;
     DEBUG(0, "%s\n", version);
-    pcmcia_get_card_services_info(&serv);
-    if (serv.Revision != CS_RELEASE_CODE) {
-	printk(KERN_NOTICE "daqp_cs: Card Services release "
-	       "does not match!\n");
-	return -1;
-    }
 	pcmcia_register_driver(&daqp_cs_driver);
     comedi_driver_register(&driver_daqp);
     return 0;