diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-07-12 07:59:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-12 07:59:38 -0700 |
| commit | b691347a92e12e0bf19fe500eb23cf0363f2ecd5 (patch) | |
| tree | 48a7381ba0dea3f9cf6a0e3b12310908f01a56d9 | |
| parent | bd0d7aa6b20a9e78def76a0ba8c414daf253c295 (diff) | |
| download | linux-3.10-b691347a92e12e0bf19fe500eb23cf0363f2ecd5.tar.gz linux-3.10-b691347a92e12e0bf19fe500eb23cf0363f2ecd5.tar.bz2 linux-3.10-b691347a92e12e0bf19fe500eb23cf0363f2ecd5.zip | |
lanai: use pci_dev->subsystem_device
The driver reads PCI subsystem IDs from the PCI configuration registers while
it is already stored by the PCI subsystem in the 'subsystem_device' field of
'struct pci_dev'...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/atm/lanai.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index 4e8ba56f75d..e828c548749 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c @@ -1947,7 +1947,6 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai) { struct pci_dev *pci = lanai->pci; int result; - u16 w; if (pci_enable_device(pci) != 0) { printk(KERN_ERR DEV_LABEL "(itf %d): can't enable " @@ -1965,13 +1964,7 @@ static int __devinit lanai_pci_start(struct lanai_dev *lanai) "(itf %d): No suitable DMA available.\n", lanai->number); return -EBUSY; } - result = pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &w); - if (result != PCIBIOS_SUCCESSFUL) { - printk(KERN_ERR DEV_LABEL "(itf %d): can't read " - "PCI_SUBSYSTEM_ID: %d\n", lanai->number, result); - return -EINVAL; - } - result = check_board_id_and_rev("PCI", w, NULL); + result = check_board_id_and_rev("PCI", pci->subsystem_device, NULL); if (result != 0) return result; /* Set latency timer to zero as per lanai docs */ |