From: Sergei Shtylyov Date: Fri, 22 Jul 2011 05:37:24 +0000 (+0000) Subject: r8169: use pci_dev->subsystem_{vendor|device} X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ccbae55e1c6dc18e95d72c044cf9345ea08abf7b;p=openwrt%2Fstaging%2Fblogic.git r8169: use pci_dev->subsystem_{vendor|device} The driver reads PCI subsystem IDs from the PCI configuration registers while they are already stored by the PCI subsystem in the 'subsystem_{vendor|device}' fields of 'struct pci_dev'... Signed-off-by: Sergei Shtylyov Signed-off-by: David S. Miller --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 40bcb82d9116..4e2d1448093c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2160,12 +2160,9 @@ static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp) static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp) { struct pci_dev *pdev = tp->pci_dev; - u16 vendor_id, device_id; - pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &vendor_id); - pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &device_id); - - if ((vendor_id != PCI_VENDOR_ID_GIGABYTE) || (device_id != 0xe000)) + if ((pdev->subsystem_vendor != PCI_VENDOR_ID_GIGABYTE) || + (pdev->subsystem_device != 0xe000)) return; rtl_writephy(tp, 0x1f, 0x0001);