PCI: add USR vendor id and use it in r8169 and w6692 driver

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The PCI vendor id of U.S. Robotics isn't defined in pci_ids.h so far,
only ISDN driver w6692 has a private definition. Move the definition
to pci_ids.h and use it in the r8169 driver too.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Heiner Kallweit and committed by

David S. Miller 7 years ago 9206eb0b 48872c11

+3 -4

3 changed files

expand all

drivers

isdn

hardware

mISDN

w6692.c

net

ethernet

realtek

r8169.c

include

linux

pci_ids.h

-3

drivers/isdn/hardware/mISDN/w6692.c

··· 52 52 {W6692_USR, "USR W6692"} 53 53 }; 54 54 55 - #ifndef PCI_VENDOR_ID_USR 56 - #define PCI_VENDOR_ID_USR 0x16ec 57 55 #define PCI_DEVICE_ID_USR_6692 0x3409 58 - #endif 59 56 60 57 struct w6692_ch { 61 58 struct bchannel bch;

+1 -1

drivers/net/ethernet/realtek/r8169.c

··· 224 224 { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, 225 225 { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 }, 226 226 { PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 }, 227 - { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 }, 227 + { PCI_DEVICE(PCI_VENDOR_ID_USR, 0x0116), 0, 0, RTL_CFG_0 }, 228 228 { PCI_VENDOR_ID_LINKSYS, 0x1032, 229 229 PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 }, 230 230 { 0x0001, 0x8168,

include/linux/pci_ids.h

··· 2359 2359 2360 2360 #define PCI_VENDOR_ID_SYNOPSYS 0x16c3 2361 2361 2362 + #define PCI_VENDOR_ID_USR 0x16ec 2363 + 2362 2364 #define PCI_VENDOR_ID_VITESSE 0x1725 2363 2365 #define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174 2364 2366