diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-07-22 05:50:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-22 17:01:12 -0700 |
| commit | 781223a15c510b4cb11328603bfc41ec8352f015 (patch) | |
| tree | 7740c40ddf8bcccaf81788c785781a10c618d545 /drivers | |
| parent | ccbae55e1c6dc18e95d72c044cf9345ea08abf7b (diff) | |
| download | linux-3.10-781223a15c510b4cb11328603bfc41ec8352f015.tar.gz linux-3.10-781223a15c510b4cb11328603bfc41ec8352f015.tar.bz2 linux-3.10-781223a15c510b4cb11328603bfc41ec8352f015.zip | |
sbni: use pci_dev->subsystem_device
The driver reads PCI subsystem ID from the PCI configuration register while it's
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wan/sbni.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 40e95facdb6..86127bcc9f7 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c @@ -303,7 +303,6 @@ sbni_pci_probe( struct net_device *dev ) != NULL ) { int pci_irq_line; unsigned long pci_ioaddr; - u16 subsys; if( pdev->vendor != SBNI_PCI_VENDOR && pdev->device != SBNI_PCI_DEVICE ) @@ -314,9 +313,7 @@ sbni_pci_probe( struct net_device *dev ) /* Avoid already found cards from previous calls */ if( !request_region( pci_ioaddr, SBNI_IO_EXTENT, dev->name ) ) { - pci_read_config_word( pdev, PCI_SUBSYSTEM_ID, &subsys ); - - if (subsys != 2) + if (pdev->subsystem_device != 2) continue; /* Dual adapter is present */ |