diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:50:33 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-31 09:50:33 -0400 |
commit | 2f3061eb1086f98990d6495b8c63a1b83f2f59aa (patch) | |
tree | 01066412a16e05f459d405c2130ae98f95090d5f /drivers/pcmcia/pcmcia_ioctl.c | |
parent | 994917f8b718f1cd7114317cc3cbf04fe46c1841 (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 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 579ec9455706..1703b20cad5d 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
@@ -858,7 +858,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
858 | break; | 858 | break; |
859 | case DS_PARSE_TUPLE: | 859 | case DS_PARSE_TUPLE: |
860 | buf->tuple.TupleData = buf->tuple_parse.data; | 860 | buf->tuple.TupleData = buf->tuple_parse.data; |
861 | ret = pccard_parse_tuple(&buf->tuple, &buf->tuple_parse.parse); | 861 | ret = pcmcia_parse_tuple(&buf->tuple, &buf->tuple_parse.parse); |
862 | break; | 862 | break; |
863 | case DS_RESET_CARD: | 863 | case DS_RESET_CARD: |
864 | ret = pcmcia_reset_card(s); | 864 | ret = pcmcia_reset_card(s); |