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 <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index be4ea132981343dde6ebd521c0bd436dc538438c..839df305348ea13e672fb123fe1cd058b392d592 100644 (file)
--- 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;