diff options
| author | Sergei Shtylyov | 2011-07-22 17:58:23 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-08-08 20:29:22 +0200 |
| commit | 581c9c4f7113fbb4d28d58ab6b2125e16ce62812 (patch) | |
| tree | 751110e04edd017e297e2585716afbf54074a7df /drivers/net | |
| parent | mwifiex: remove redundant variable scan_table_idx (diff) | |
| download | kernel-qcow2-linux-581c9c4f7113fbb4d28d58ab6b2125e16ce62812.tar.gz kernel-qcow2-linux-581c9c4f7113fbb4d28d58ab6b2125e16ce62812.tar.xz kernel-qcow2-linux-581c9c4f7113fbb4d28d58ab6b2125e16ce62812.zip | |
ath9k: 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: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index be4ea1329813..839df305348e 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -156,7 +156,6 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) struct ath_softc *sc; struct ieee80211_hw *hw; u8 csz; - u16 subsysid; u32 val; int ret = 0; char hw_name[64]; @@ -250,8 +249,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) sc->irq = pdev->irq; - pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsysid); - ret = ath9k_init_device(id->device, sc, subsysid, &ath_pci_bus_ops); + ret = ath9k_init_device(id->device, sc, pdev->subsystem_device, + &ath_pci_bus_ops); if (ret) { dev_err(&pdev->dev, "Failed to initialize device\n"); goto err_init; |