aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 09:50:33 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 09:50:33 -0400
commit2f3061eb1086f98990d6495b8c63a1b83f2f59aa (patch)
tree01066412a16e05f459d405c2130ae98f95090d5f /include
parent994917f8b718f1cd7114317cc3cbf04fe46c1841 (diff)
pcmcia: remove unused argument to pcmcia_parse_tuple()
Since we're just parsing the tuple being passed to this function, we don't need any device-specific information. Also, remove the call to pcmcia_validate_cis() from pcmciamtd.c, since it is already called by the PCMCIA core. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/cistpl.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index 7e8c2bcf11a7..353abe74be74 100644
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -583,13 +583,12 @@ typedef struct cisinfo_t {
583#ifdef __KERNEL__ 583#ifdef __KERNEL__
584struct pcmcia_socket; 584struct pcmcia_socket;
585 585
586int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
587
586/* don't use outside of PCMCIA core yet */ 588/* don't use outside of PCMCIA core yet */
587int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple); 589int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
588int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple); 590int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple);
589int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple); 591int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
590int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse);
591
592int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *count);
593 592
594/* ... but use these wrappers instead */ 593/* ... but use these wrappers instead */
595#define pcmcia_get_first_tuple(p_dev, tuple) \ 594#define pcmcia_get_first_tuple(p_dev, tuple) \
@@ -601,12 +600,6 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
601#define pcmcia_get_tuple_data(p_dev, tuple) \ 600#define pcmcia_get_tuple_data(p_dev, tuple) \
602 pccard_get_tuple_data(p_dev->socket, tuple) 601 pccard_get_tuple_data(p_dev->socket, tuple)
603 602
604#define pcmcia_parse_tuple(p_dev, tuple, parse) \
605 pccard_parse_tuple(tuple, parse)
606
607#define pcmcia_validate_cis(p_dev, info) \
608 pccard_validate_cis(p_dev->socket, p_dev->func, info)
609
610int pcmcia_loop_config(struct pcmcia_device *p_dev, 603int pcmcia_loop_config(struct pcmcia_device *p_dev,
611 int (*conf_check) (struct pcmcia_device *p_dev, 604 int (*conf_check) (struct pcmcia_device *p_dev,
612 cistpl_cftable_entry_t *cf, 605 cistpl_cftable_entry_t *cf,