On Mon, 19 Oct 2009 01:07:35 +0200 Dominik Brodowski wrote: > Remove the pcmcia_get_{first,next}_tuple() calls no longer needed by > (current) pcmcia device drivers. linux-next 20091026: drivers/staging/comedi/drivers/cb_das16_cs.c:155: error: implicit declaration of function 'pcmcia_get_first_tuple' drivers/staging/comedi/drivers/cb_das16_cs.c:156: error: implicit declaration of function 'pcmcia_get_tuple_data' drivers/staging/comedi/drivers/cb_das16_cs.c:883: error: implicit declaration of function 'pcmcia_get_next_tuple' There are also other comedi/ drivers that this randconfig didn't attempt to build that are still using these same interfaces. > Signed-off-by: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx> > --- > drivers/pcmcia/cs_internal.h | 9 +++++++++ > include/pcmcia/ds.h | 15 --------------- > 2 files changed, 9 insertions(+), 15 deletions(-) > > diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h > index 06a14c9..70432ca 100644 > --- a/drivers/pcmcia/cs_internal.h > +++ b/drivers/pcmcia/cs_internal.h > @@ -206,6 +206,15 @@ int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, > cisparse_t *parse, > void *priv_data)); > > +int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, > + tuple_t *tuple); > + > +int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, > + tuple_t *tuple); > + > +int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); > + > + > /* rsrc_mgr.c */ > int pcmcia_validate_mem(struct pcmcia_socket *s); > struct resource *pcmcia_find_io_region(unsigned long base, > diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h > index 2eb6e24..6c37d4e 100644 > --- a/include/pcmcia/ds.h > +++ b/include/pcmcia/ds.h > @@ -229,21 +229,6 @@ int pcmcia_reset_card(struct pcmcia_socket *skt); > int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, > conf_reg_t *reg); > > -/* deprecated -- do not use in drivers. */ > -int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, > - tuple_t *tuple); > -#define pcmcia_get_first_tuple(p_dev, tuple) \ > - pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple) > - > -int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, > - tuple_t *tuple); > -#define pcmcia_get_next_tuple(p_dev, tuple) \ > - pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple) > - > -int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); > -#define pcmcia_get_tuple_data(p_dev, tuple) \ > - pccard_get_tuple_data(p_dev->socket, tuple) > - > /* device configuration */ > int pcmcia_request_io(struct pcmcia_device *p_dev, io_req_t *req); > int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req); > -- --- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html