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

Commit 61485c63 authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

mfd: Convert to DEFINE_PCI_DEVICE_TABLE 



Convert static struct pci_device_id *[] to static DEFINE_PCI_DEVICE_TABLE
tables.

Cc: Andres Salomon <dilinger@queued.net>
Cc: Denis Turischev <denis@compulab.co.il>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Vincent Sanders <vince@simtec.co.uk>
Cc: Mocean Laboratories <info@mocean-labs.com>
Cc: Harald Welte <HaraldWelte@viatech.com>
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 73fe6b2b

drivers/mfd/cs5535-mfd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,7 @@ static void __devexit cs5535_mfd_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

	pci_disable_device(pdev);

}

}





static struct pci_device_id cs5535_mfd_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(cs5535_mfd_pci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },

	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },

	{ 0, }

	{ 0, }

drivers/mfd/lpc_sch.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ static struct mfd_cell tunnelcreek_cells[] = { 
	},

	},

};

};





static struct pci_device_id lpc_sch_ids[] = {

static DEFINE_PCI_DEVICE_TABLE(lpc_sch_ids) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SCH_LPC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ITC_LPC) },

	{ 0, }

	{ 0, }

drivers/mfd/sm501.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1720,7 +1720,7 @@ static int sm501_plat_remove(struct platform_device *dev) 
	return 0;

	return 0;

}

}





static struct pci_device_id sm501_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(sm501_pci_tbl) = {

	{ 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ 0x126f, 0x0501, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ 0, },

	{ 0, },

};

};

drivers/mfd/timberdale.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -857,7 +857,7 @@ static void __devexit timb_remove(struct pci_dev *dev) 
	kfree(priv);

	kfree(priv);

}

}





static struct pci_device_id timberdale_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(timberdale_pci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },

	{ PCI_DEVICE(PCI_VENDOR_ID_TIMB, PCI_DEVICE_ID_TIMB) },

	{ 0 }

	{ 0 }

};

};

drivers/mfd/vx855.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static void __devexit vx855_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

	pci_disable_device(pdev);

}

}





static struct pci_device_id vx855_pci_tbl[] = {

static DEFINE_PCI_DEVICE_TABLE(vx855_pci_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },

	{ PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) },

	{ 0, }

	{ 0, }

};

};