aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-04-05 12:05:27 -0400
committerDarren Hart (VMware) <dvhart@infradead.org>2017-04-13 13:16:04 -0400
commit74bc77a3db0f68609c4c7641e010fd85e4c77a36 (patch)
treef25965fdf6f34bbc7d390762dcd820a5e08c1621
parent07ac1af3fc3e11f5b0948597aaad78d30c45a289 (diff)
platform/x86: intel_scu_ipc: Introduce SCU_DEVICE() macro
For better maintainability and readability introduce a macro for device ID table. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r--drivers/platform/x86/intel_scu_ipc.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 6d626a8878c7..f9d3eb505a0b 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -609,22 +609,14 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
609 return 0; 609 return 0;
610} 610}
611 611
612#define SCU_DEVICE(id, pdata) {PCI_VDEVICE(INTEL, id), (kernel_ulong_t)&pdata}
613
612static const struct pci_device_id pci_ids[] = { 614static const struct pci_device_id pci_ids[] = {
613 { 615 SCU_DEVICE(PCI_DEVICE_ID_LINCROFT, intel_scu_ipc_lincroft_pdata),
614 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT), 616 SCU_DEVICE(PCI_DEVICE_ID_PENWELL, intel_scu_ipc_penwell_pdata),
615 (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata, 617 SCU_DEVICE(PCI_DEVICE_ID_CLOVERVIEW, intel_scu_ipc_penwell_pdata),
616 }, { 618 SCU_DEVICE(PCI_DEVICE_ID_TANGIER, intel_scu_ipc_tangier_pdata),
617 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PENWELL), 619 {}
618 (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
619 }, {
620 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_CLOVERVIEW),
621 (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
622 }, {
623 PCI_VDEVICE(INTEL, PCI_DEVICE_ID_TANGIER),
624 (kernel_ulong_t)&intel_scu_ipc_tangier_pdata,
625 }, {
626 0,
627 }
628}; 620};
629 621
630static struct pci_driver ipc_driver = { 622static struct pci_driver ipc_driver = {