diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
commit | a11c5c9ef6dc562fc7df7aaf7911569a85f4d71c (patch) | |
tree | 6e0a6c7a259287e201ab3e727c8d85286e93159a /arch/x86 | |
parent | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (diff) | |
parent | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (diff) |
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas:
"Part two of the PCI changes for v3.17:
- Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine)
It's a mechanical change that removes uses of the
DEFINE_PCI_DEVICE_TABLE macro. I waited until later in the merge
window to reduce conflicts, but it's possible you'll still see a few"
* tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore.c | 10 | ||||
-rw-r--r-- | arch/x86/kernel/iosf_mbi.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index cfc6f9dfcd90..0939f86f543d 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c | |||
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = { | |||
945 | NULL, | 945 | NULL, |
946 | }; | 946 | }; |
947 | 947 | ||
948 | static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = { | 948 | static const struct pci_device_id snbep_uncore_pci_ids[] = { |
949 | { /* Home Agent */ | 949 | { /* Home Agent */ |
950 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA), | 950 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA), |
951 | .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0), | 951 | .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0), |
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = { | |||
1510 | NULL, | 1510 | NULL, |
1511 | }; | 1511 | }; |
1512 | 1512 | ||
1513 | static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = { | 1513 | static const struct pci_device_id ivt_uncore_pci_ids[] = { |
1514 | { /* Home Agent 0 */ | 1514 | { /* Home Agent 0 */ |
1515 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30), | 1515 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30), |
1516 | .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0), | 1516 | .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0), |
@@ -1985,7 +1985,7 @@ static struct intel_uncore_type *snb_pci_uncores[] = { | |||
1985 | NULL, | 1985 | NULL, |
1986 | }; | 1986 | }; |
1987 | 1987 | ||
1988 | static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { | 1988 | static const struct pci_device_id snb_uncore_pci_ids[] = { |
1989 | { /* IMC */ | 1989 | { /* IMC */ |
1990 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC), | 1990 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC), |
1991 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 1991 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
@@ -1993,7 +1993,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { | |||
1993 | { /* end: all zeroes */ }, | 1993 | { /* end: all zeroes */ }, |
1994 | }; | 1994 | }; |
1995 | 1995 | ||
1996 | static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { | 1996 | static const struct pci_device_id ivb_uncore_pci_ids[] = { |
1997 | { /* IMC */ | 1997 | { /* IMC */ |
1998 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC), | 1998 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC), |
1999 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 1999 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
@@ -2001,7 +2001,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { | |||
2001 | { /* end: all zeroes */ }, | 2001 | { /* end: all zeroes */ }, |
2002 | }; | 2002 | }; |
2003 | 2003 | ||
2004 | static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = { | 2004 | static const struct pci_device_id hsw_uncore_pci_ids[] = { |
2005 | { /* IMC */ | 2005 | { /* IMC */ |
2006 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC), | 2006 | PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC), |
2007 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), | 2007 | .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), |
diff --git a/arch/x86/kernel/iosf_mbi.c b/arch/x86/kernel/iosf_mbi.c index d30acdc1229d..9030e83db6ee 100644 --- a/arch/x86/kernel/iosf_mbi.c +++ b/arch/x86/kernel/iosf_mbi.c | |||
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev, | |||
202 | return 0; | 202 | return 0; |
203 | } | 203 | } |
204 | 204 | ||
205 | static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = { | 205 | static const struct pci_device_id iosf_mbi_pci_ids[] = { |
206 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) }, | 206 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) }, |
207 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) }, | 207 | { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) }, |
208 | { 0, }, | 208 | { 0, }, |