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

Commit a11c5c9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 179c0ac6 9baa3c34

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+5 −5
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = { 
	NULL,

};



static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = {

static const struct pci_device_id snbep_uncore_pci_ids[] = {

	{ /* Home Agent */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA),

		.driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0),
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = { 
	NULL,

};



static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {

static const struct pci_device_id ivt_uncore_pci_ids[] = {

	{ /* Home Agent 0 */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30),

		.driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0),
@@ -1985,7 +1985,7 @@ static struct intel_uncore_type *snb_pci_uncores[] = { 
	NULL,

};



static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {

static const struct pci_device_id snb_uncore_pci_ids[] = {

	{ /* IMC */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC),

		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
@@ -1993,7 +1993,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = { 
	{ /* end: all zeroes */ },

};



static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {

static const struct pci_device_id ivb_uncore_pci_ids[] = {

	{ /* IMC */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),

		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
@@ -2001,7 +2001,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = { 
	{ /* end: all zeroes */ },

};



static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {

static const struct pci_device_id hsw_uncore_pci_ids[] = {

	{ /* IMC */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC),

		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),

arch/x86/kernel/iosf_mbi.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev, 
	return 0;

}



static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = {

static const struct pci_device_id iosf_mbi_pci_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) },

	{ 0, },

drivers/block/mtip32xx/mtip32xx.c

+1 −1
Original line number Diff line number Diff line
@@ -4632,7 +4632,7 @@ static void mtip_pci_shutdown(struct pci_dev *pdev) 
}



/* Table of device ids supported by this driver. */

static DEFINE_PCI_DEVICE_TABLE(mtip_pci_tbl) = {

static const struct pci_device_id mtip_pci_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320H_DEVICE_ID) },

	{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320M_DEVICE_ID) },

	{ PCI_DEVICE(PCI_VENDOR_ID_MICRON, P320S_DEVICE_ID) },

drivers/block/rsxx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ static const struct pci_error_handlers rsxx_err_handler = { 
	.slot_reset     = rsxx_slot_reset,

};



static DEFINE_PCI_DEVICE_TABLE(rsxx_pci_ids) = {

static const struct pci_device_id rsxx_pci_ids[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS70_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS80_FLASH)},

	{0,},

drivers/block/skd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4766,7 +4766,7 @@ static const struct block_device_operations skd_blockdev_ops = { 
 *****************************************************************************

 */



static DEFINE_PCI_DEVICE_TABLE(skd_pci_tbl) = {

static const struct pci_device_id skd_pci_tbl[] = {

	{ PCI_VENDOR_ID_STEC, PCI_DEVICE_ID_S1120,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, },

	{ 0 }                     /* terminate list */