summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cistpl.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 15:50:33 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-31 15:50:33 +0200
commit2f3061eb1086f98990d6495b8c63a1b83f2f59aa (patch)
tree01066412a16e05f459d405c2130ae98f95090d5f /drivers/pcmcia/cistpl.c
parent994917f8b718f1cd7114317cc3cbf04fe46c1841 (diff)
downloadlinux-2f3061eb1086f98990d6495b8c63a1b83f2f59aa.tar.gz
linux-2f3061eb1086f98990d6495b8c63a1b83f2f59aa.tar.bz2
linux-2f3061eb1086f98990d6495b8c63a1b83f2f59aa.zip
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 'drivers/pcmcia/cistpl.c')
-rw-r--r--drivers/pcmcia/cistpl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 772fc96d5ec3..dcce9f5d8465 100644
--- a/drivers/pcmcia/cistpl.c
+++ b/drivers/pcmcia/cistpl.c
@@ -1359,7 +1359,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
/*====================================================================*/
-int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)
{
int ret = 0;
@@ -1442,7 +1442,7 @@ int pccard_parse_tuple(tuple_t *tuple, cisparse_t *parse)
__cs_dbg(0, "parse_tuple failed %d\n", ret);
return ret;
}
-EXPORT_SYMBOL(pccard_parse_tuple);
+EXPORT_SYMBOL(pcmcia_parse_tuple);
/*======================================================================
@@ -1472,7 +1472,7 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t
ret = pccard_get_tuple_data(s, &tuple);
if (ret != 0)
goto done;
- ret = pccard_parse_tuple(&tuple, parse);
+ ret = pcmcia_parse_tuple(&tuple, parse);
done:
kfree(buf);
return ret;