Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccbae55e authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 431bf99d

drivers/net/r8169.c

+2 −5
Original line number Diff line number Diff line
@@ -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);