aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/pcmciamtd.c
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 /drivers/mtd/maps/pcmciamtd.c
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 'drivers/mtd/maps/pcmciamtd.c')
-rw-r--r--drivers/mtd/maps/pcmciamtd.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 27b3d96b7124..d600c2deff73 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -374,7 +374,7 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,
374 cs_error(link, GetTupleData, rc); 374 cs_error(link, GetTupleData, rc);
375 break; 375 break;
376 } 376 }
377 rc = pcmcia_parse_tuple(link, &tuple, &parse); 377 rc = pcmcia_parse_tuple(&tuple, &parse);
378 if (rc != 0) { 378 if (rc != 0) {
379 cs_error(link, ParseTuple, rc); 379 cs_error(link, ParseTuple, rc);
380 break; 380 break;
@@ -498,11 +498,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
498 498
499 DEBUG(3, "link=0x%p", link); 499 DEBUG(3, "link=0x%p", link);
500 500
501 DEBUG(2, "Validating CIS");
502 ret = pcmcia_validate_cis(link, NULL);
503 if (ret != 0)
504 cs_error(link, GetTupleData, ret);
505
506 card_settings(dev, link, &new_name); 501 card_settings(dev, link, &new_name);
507 502
508 dev->pcmcia_map.phys = NO_XIP; 503 dev->pcmcia_map.phys = NO_XIP;