lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irda: use PCI_VENDOR_ID_*

Browse Source 
Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Mason
2011-08-03 06:42:42 +00:00
committed by David S. Miller
parent 06fa0a883a
commit 5ee5a07ce3
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/irda/smsc-ircc2.c
View File

@@ -2405,8 +2405,6 @@ static int __init smsc_superio_lpc(unsigned short cfg_base)
* addresses making a subsystem device table necessary. * addresses making a subsystem device table necessary.
*/ */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define PCIID_VENDOR_INTEL 0x8086
#define PCIID_VENDOR_ALI 0x10b9
static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = { static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __initdata = {
/* /*
* Subsystems needing entries: * Subsystems needing entries:
@@ -2416,7 +2414,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
*/ */
{ {
/* Guessed entry */ /* Guessed entry */
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */ .vendor = PCI_VENDOR_ID_INTEL, /* Intel 82801DBM LPC bridge */
.device = 0x24cc, .device = 0x24cc,
.subvendor = 0x103c, .subvendor = 0x103c,
.subdevice = 0x08bc, .subdevice = 0x08bc,
@@ -2429,7 +2427,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
.name = "HP nx5000 family", .name = "HP nx5000 family",
}, },
{ {
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */ .vendor = PCI_VENDOR_ID_INTEL, /* Intel 82801DBM LPC bridge */
.device = 0x24cc, .device = 0x24cc,
.subvendor = 0x103c, .subvendor = 0x103c,
.subdevice = 0x088c, .subdevice = 0x088c,
@@ -2443,7 +2441,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
.name = "HP nc8000 family", .name = "HP nc8000 family",
}, },
{ {
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */ .vendor = PCI_VENDOR_ID_INTEL, /* Intel 82801DBM LPC bridge */
.device = 0x24cc, .device = 0x24cc,
.subvendor = 0x103c, .subvendor = 0x103c,
.subdevice = 0x0890, .subdevice = 0x0890,
@@ -2456,7 +2454,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
.name = "HP nc6000 family", .name = "HP nc6000 family",
}, },
{ {
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801DBM LPC bridge */ .vendor = PCI_VENDOR_ID_INTEL, /* Intel 82801DBM LPC bridge */
.device = 0x24cc, .device = 0x24cc,
.subvendor = 0x0e11, .subvendor = 0x0e11,
.subdevice = 0x0860, .subdevice = 0x0860,
@@ -2471,7 +2469,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
}, },
{ {
/* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */ /* Intel 82801DB/DBL (ICH4/ICH4-L) LPC Interface Bridge */
.vendor = PCIID_VENDOR_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x24c0, .device = 0x24c0,
.subvendor = 0x1179, .subvendor = 0x1179,
.subdevice = 0xffff, /* 0xffff is "any" */ .subdevice = 0xffff, /* 0xffff is "any" */
@@ -2484,7 +2482,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
.name = "Toshiba laptop with Intel 82801DB/DBL LPC bridge", .name = "Toshiba laptop with Intel 82801DB/DBL LPC bridge",
}, },
{ {
.vendor = PCIID_VENDOR_INTEL, /* Intel 82801CAM ISA bridge */ .vendor = PCI_VENDOR_ID_INTEL, /* Intel 82801CAM ISA bridge */
.device = 0x248c, .device = 0x248c,
.subvendor = 0x1179, .subvendor = 0x1179,
.subdevice = 0xffff, /* 0xffff is "any" */ .subdevice = 0xffff, /* 0xffff is "any" */
@@ -2498,7 +2496,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
}, },
{ {
/* 82801DBM (ICH4-M) LPC Interface Bridge */ /* 82801DBM (ICH4-M) LPC Interface Bridge */
.vendor = PCIID_VENDOR_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.device = 0x24cc, .device = 0x24cc,
.subvendor = 0x1179, .subvendor = 0x1179,
.subdevice = 0xffff, /* 0xffff is "any" */ .subdevice = 0xffff, /* 0xffff is "any" */
@@ -2512,7 +2510,7 @@ static struct smsc_ircc_subsystem_configuration subsystem_configurations[] __ini
}, },
{ {
/* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */ /* ALi M1533/M1535 PCI to ISA Bridge [Aladdin IV/V/V+] */
.vendor = PCIID_VENDOR_ALI, .vendor = PCI_VENDOR_ID_AL,
.device = 0x1533, .device = 0x1533,
.subvendor = 0x1179, .subvendor = 0x1179,
.subdevice = 0xffff, /* 0xffff is "any" */ .subdevice = 0xffff, /* 0xffff is "any" */