[PCMCIA] 06-parse_tuple.diff

Add a wrapper around pcmcia_parse_tuple, and use pccard_parse_tuple
in ds.c

diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index a1a06bdca6d85b7642065b57a3bdfda89f2f7e0f..547a20350a1533ceb48545154e9dd1dcb8ae3718 100644 (file)
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -1313,7 +1313,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
 
 /*====================================================================*/
 
-int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
 {
     int ret = CS_SUCCESS;
     
@@ -1394,6 +1394,7 @@ int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse
     }
     return ret;
 }
+EXPORT_SYMBOL(pccard_parse_tuple);
 
 /*======================================================================
 
@@ -1530,3 +1531,8 @@ int pcmcia_get_tuple_data(client_handle_t handle, tuple_t *tuple)
 }
 EXPORT_SYMBOL(pcmcia_get_tuple_data);
 
+int pcmcia_parse_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+{
+       return pccard_parse_tuple(tuple, parse);
+}
+EXPORT_SYMBOL(pcmcia_parse_tuple);

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index aeb0175a14f80ae11b45e54ad0f660754ecd2ea4..e351d6c7a669924660e4472867d98f658b92a562 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -2109,7 +2109,6 @@ EXPORT_SYMBOL(pcmcia_get_status);
 EXPORT_SYMBOL(pcmcia_insert_card);
 EXPORT_SYMBOL(pcmcia_map_mem_page);
 EXPORT_SYMBOL(pcmcia_modify_configuration);
-EXPORT_SYMBOL(pcmcia_parse_tuple);
 EXPORT_SYMBOL(pcmcia_register_client);
 EXPORT_SYMBOL(pcmcia_release_configuration);
 EXPORT_SYMBOL(pcmcia_release_io);

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 3bf217ed8ac45b3c00d147bd76b27969b2e018c7..af38181cfbb3e3207e45891293a754df850a3f13 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -956,7 +956,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
        break;
     case DS_PARSE_TUPLE:
        buf.tuple.TupleData = buf.tuple_parse.data;
-       ret = pcmcia_parse_tuple(s->handle, &buf.tuple, &buf.tuple_parse.parse);
+       ret = pccard_parse_tuple(&buf.tuple, &buf.tuple_parse.parse);
        break;
     case DS_RESET_CARD:
        ret = pcmcia_reset_card(s->handle, NULL);

diff --git a/include/pcmcia/cistpl.h b/include/pcmcia/cistpl.h
index cebb0ef890697e442f1c69caaebd83d83dce7edf..203ee92b4ca5257ac725f0b5e5b18aa5fb57883f 100644 (file)
--- a/include/pcmcia/cistpl.h
+++ b/include/pcmcia/cistpl.h
@@ -613,5 +613,6 @@ int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis);
 int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);
 int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple);
 int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
+int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse);
 
 #endif /* LINUX_CISTPL_H */