From 98318a1bfb2b1100d684b3124bcd18aae29249d6 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 6 Jan 2009 14:13:28 +0000 Subject: [PATCH] PCMCIA changes for compatibility with 2.6.28 kernel. 'CS-SUCCESS' and other special error codes are gone. 'pcmcia_parse_tuple()' now has two arguments, not three. --- comedi/drivers/cb_das16_cs.c | 8 ++++---- comedi/drivers/das08_cs.c | 4 ++-- comedi/drivers/ni_daq_700.c | 4 ++-- comedi/drivers/ni_daq_dio24.c | 4 ++-- comedi/drivers/ni_labpc_cs.c | 4 ++-- comedi/drivers/ni_mio_cs.c | 14 +++++++------- comedi/drivers/quatech_daqp_cs.c | 4 ++-- include/pcmcia/Makefile.am | 2 +- include/pcmcia/cistpl.h | 18 ++++++++++++++++++ 9 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 include/pcmcia/cistpl.h diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c index 3f4b4ab0..0ef8e1d9 100644 --- a/comedi/drivers/cb_das16_cs.c +++ b/comedi/drivers/cb_das16_cs.c @@ -138,8 +138,8 @@ static int get_prodid(comedi_device * dev, struct pcmcia_device *link) tuple.TupleDataMax = 255; tuple.DesiredTuple = CISTPL_MANFID; tuple.Attributes = TUPLE_RETURN_COMMON; - if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && - (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) { + if ((pcmcia_get_first_tuple(link, &tuple) == 0) && + (pcmcia_get_tuple_data(link, &tuple) == 0)) { prodid = le16_to_cpu(buf[1]); } @@ -773,7 +773,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link) if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0) goto cs_failed; last_fn = ParseTuple; - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) goto cs_failed; link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0]; @@ -798,7 +798,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if (pcmcia_get_tuple_data(link, &tuple)) goto next_entry; - if (pcmcia_parse_tuple(link, &tuple, &parse)) + if (pcmcia_parse_tuple(&tuple, &parse)) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/comedi/drivers/das08_cs.c b/comedi/drivers/das08_cs.c index 93fca06c..d1883807 100644 --- a/comedi/drivers/das08_cs.c +++ b/comedi/drivers/das08_cs.c @@ -271,7 +271,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link) if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0) goto cs_failed; last_fn = ParseTuple; - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) goto cs_failed; link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0]; @@ -296,7 +296,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if ((last_ret = pcmcia_get_tuple_data(link, &tuple)) != 0) goto next_entry; - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/comedi/drivers/ni_daq_700.c b/comedi/drivers/ni_daq_700.c index e12603ec..0e0f2f07 100644 --- a/comedi/drivers/ni_daq_700.c +++ b/comedi/drivers/ni_daq_700.c @@ -601,7 +601,7 @@ static void dio700_config(struct pcmcia_device *link) cs_error(link, GetTupleData, last_ret); goto cs_failed; } - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) { + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) { cs_error(link, ParseTuple, last_ret); goto cs_failed; } @@ -629,7 +629,7 @@ static void dio700_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if (pcmcia_get_tuple_data(link, &tuple) != 0) goto next_entry; - if (pcmcia_parse_tuple(link, &tuple, &parse) != 0) + if (pcmcia_parse_tuple(&tuple, &parse) != 0) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c index 790ecfe0..7c3c30db 100644 --- a/comedi/drivers/ni_daq_dio24.c +++ b/comedi/drivers/ni_daq_dio24.c @@ -358,7 +358,7 @@ static void dio24_config(struct pcmcia_device *link) cs_error(link, GetTupleData, last_ret); goto cs_failed; } - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse)) != 0) { + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) { cs_error(link, ParseTuple, last_ret); goto cs_failed; } @@ -386,7 +386,7 @@ static void dio24_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if (pcmcia_get_tuple_data(link, &tuple) != 0) goto next_entry; - if (pcmcia_parse_tuple(link, &tuple, &parse) != 0) + if (pcmcia_parse_tuple(&tuple, &parse) != 0) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/comedi/drivers/ni_labpc_cs.c b/comedi/drivers/ni_labpc_cs.c index 19f900d1..89d452ff 100644 --- a/comedi/drivers/ni_labpc_cs.c +++ b/comedi/drivers/ni_labpc_cs.c @@ -336,7 +336,7 @@ static void labpc_config(struct pcmcia_device *link) cs_error(link, GetTupleData, last_ret); goto cs_failed; } - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse))) { + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse))) { cs_error(link, ParseTuple, last_ret); goto cs_failed; } @@ -364,7 +364,7 @@ static void labpc_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if (pcmcia_get_tuple_data(link, &tuple)) goto next_entry; - if (pcmcia_parse_tuple(link, &tuple, &parse)) + if (pcmcia_parse_tuple(&tuple, &parse)) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c index f9cc4164..b1a57441 100644 --- a/comedi/drivers/ni_mio_cs.c +++ b/comedi/drivers/ni_mio_cs.c @@ -326,20 +326,20 @@ static void mio_cs_config(struct pcmcia_device *link) tuple.DesiredTuple = CISTPL_CONFIG; ret = pcmcia_get_first_tuple(link, &tuple); ret = pcmcia_get_tuple_data(link, &tuple); - ret = pcmcia_parse_tuple(link, &tuple, &parse); + ret = pcmcia_parse_tuple(&tuple, &parse); link->conf.ConfigBase = parse.config.base; link->conf.Present = parse.config.rmask[0]; #if 0 tuple.DesiredTuple = CISTPL_LONGLINK_MFC; tuple.Attributes = TUPLE_RETURN_COMMON | TUPLE_RETURN_LINK; - info->multi(first_tuple(link, &tuple, &parse) == CS_SUCCESS); + info->multi(first_tuple(link, &tuple, &parse) == 0); #endif tuple.DesiredTuple = CISTPL_MANFID; tuple.Attributes = TUPLE_RETURN_COMMON; - if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && - (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) { + if ((pcmcia_get_first_tuple(link, &tuple) == 0) && + (pcmcia_get_tuple_data(link, &tuple) == 0)) { manfid = le16_to_cpu(buf[0]); prodid = le16_to_cpu(buf[1]); } @@ -349,7 +349,7 @@ static void mio_cs_config(struct pcmcia_device *link) tuple.Attributes = 0; ret = pcmcia_get_first_tuple(link, &tuple); ret = pcmcia_get_tuple_data(link, &tuple); - ret = pcmcia_parse_tuple(link, &tuple, &parse); + ret = pcmcia_parse_tuple(&tuple, &parse); #if 0 printk(" index: 0x%x\n", parse.cftable_entry.index); @@ -478,8 +478,8 @@ static int get_prodid(comedi_device * dev, struct pcmcia_device *link) tuple.TupleDataMax = 255; tuple.DesiredTuple = CISTPL_MANFID; tuple.Attributes = TUPLE_RETURN_COMMON; - if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && - (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) { + if ((pcmcia_get_first_tuple(link, &tuple) == 0) && + (pcmcia_get_tuple_data(link, &tuple) == 0)) { prodid = le16_to_cpu(buf[1]); } diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c index 2eb1f976..2e7e7109 100644 --- a/comedi/drivers/quatech_daqp_cs.c +++ b/comedi/drivers/quatech_daqp_cs.c @@ -1158,7 +1158,7 @@ static void daqp_cs_config(struct pcmcia_device *link) cs_error(link, GetTupleData, last_ret); goto cs_failed; } - if ((last_ret = pcmcia_parse_tuple(link, &tuple, &parse))) { + if ((last_ret = pcmcia_parse_tuple(&tuple, &parse))) { cs_error(link, ParseTuple, last_ret); goto cs_failed; } @@ -1187,7 +1187,7 @@ static void daqp_cs_config(struct pcmcia_device *link) cistpl_cftable_entry_t *cfg = &(parse.cftable_entry); if (pcmcia_get_tuple_data(link, &tuple)) goto next_entry; - if (pcmcia_parse_tuple(link, &tuple, &parse)) + if (pcmcia_parse_tuple(&tuple, &parse)) goto next_entry; if (cfg->flags & CISTPL_CFTABLE_DEFAULT) diff --git a/include/pcmcia/Makefile.am b/include/pcmcia/Makefile.am index aacd9f8f..d393cddc 100644 --- a/include/pcmcia/Makefile.am +++ b/include/pcmcia/Makefile.am @@ -1,2 +1,2 @@ -noinst_HEADERS=ds.h +noinst_HEADERS=ds.h cistpl.h diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h new file mode 100644 index 00000000..1053653b --- /dev/null +++ b/include/pcmcia/cistpl.h @@ -0,0 +1,18 @@ +/* + * pcmcia/cistpl.h compatibility header + */ + +#ifndef __COMPAT_PCMCIA_CISTPL_H_ +#define __COMPAT_PCMCIA_CISTPL_H_ + +#include_next + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) + +/* Redefine pcmcia_parse_tuple() macro to have only 2 params, like 2.6.28. */ +#undef pcmcia_parse_tuple +#define pcmcia_parse_tuple(tuple, parse) pccard_parse_tuple(tuple, parse) + +#endif + +#endif // __COMPAT_PCMCIA_CISTPL_H_ -- 2.26.2