diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-10-25 21:28:53 -0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-04 20:09:20 -0500 |
| commit | efd50585e2ff9bd60e044fda7764d323010a7fe4 (patch) | |
| tree | f43f8f10a3cfe6ceb1b5cede6581f79134ca0e63 /drivers/scsi | |
| parent | 44e5e33e99e1b955ac6f0bb26abd9380629b48a9 (diff) | |
[PATCH] pcmcia: remove manf_id and card_id indirection
As we read out the manufactor and card_id from the PCMCIA device in the
PCMCIA core, and device drivers can access those reliably in struct
pcmcia_device's fields manf_id and card_id, remove additional (and partly
broken) manf_id and card_id detection logic from PCMCIA device drivers.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 86c2ac6ae623..336e370f7f65 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
| @@ -217,9 +217,7 @@ static int qlogic_config(struct pcmcia_device * link) | |||
| 217 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse)); | 217 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse)); |
| 218 | link->conf.ConfigBase = parse.config.base; | 218 | link->conf.ConfigBase = parse.config.base; |
| 219 | 219 | ||
| 220 | tuple.DesiredTuple = CISTPL_MANFID; | 220 | info->manf_id = link->manf_id; |
| 221 | if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) | ||
| 222 | info->manf_id = le16_to_cpu(tuple.TupleData[0]); | ||
| 223 | 221 | ||
| 224 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 222 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; |
| 225 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | 223 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); |
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 72fe5d055de1..80c28b9fb70a 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
| @@ -731,10 +731,7 @@ SYM53C500_config(struct pcmcia_device *link) | |||
| 731 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse)); | 731 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse)); |
| 732 | link->conf.ConfigBase = parse.config.base; | 732 | link->conf.ConfigBase = parse.config.base; |
| 733 | 733 | ||
| 734 | tuple.DesiredTuple = CISTPL_MANFID; | 734 | info->manf_id = link->manf_id; |
| 735 | if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && | ||
| 736 | (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS)) | ||
| 737 | info->manf_id = le16_to_cpu(tuple.TupleData[0]); | ||
| 738 | 735 | ||
| 739 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; | 736 | tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; |
| 740 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); | 737 | CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple)); |