leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: use pci_dev->subsystem_device

Browse Source 
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>
This commit is contained in:
Sergei Shtylyov 2011-07-22 19:58:23 +04:00 committed by John W. Linville
parent 26aaa4a0e9
commit 581c9c4f71
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/ath/ath9k/pci.c
View File

@ -156,7 +156,6 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct ath_softc *sc; struct ath_softc *sc;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
u8 csz; u8 csz;
u16 subsysid;
u32 val; u32 val;
int ret = 0; int ret = 0;
char hw_name[64]; 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; sc->irq = pdev->irq;
pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &subsysid); ret = ath9k_init_device(id->device, sc, pdev->subsystem_device,
ret = ath9k_init_device(id->device, sc, subsysid, &ath_pci_bus_ops); &ath_pci_bus_ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to initialize device\n"); dev_err(&pdev->dev, "Failed to initialize device\n");
goto err_init; goto err_init;