Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpio: pch: Change PCI device macros

Use PCI_DEVICE_DATA macro. No functional changes are expected.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

+10 -9
+10 -9
drivers/gpio/gpio-pch.c
··· 37 37 u32 reset; 38 38 }; 39 39 40 + #define PCI_DEVICE_ID_INTEL_EG20T_PCH 0x8803 41 + #define PCI_DEVICE_ID_ROHM_ML7223m_IOH 0x8014 42 + #define PCI_DEVICE_ID_ROHM_ML7223n_IOH 0x8043 43 + #define PCI_DEVICE_ID_ROHM_EG20T_PCH 0x8803 44 + 40 45 enum pch_type_t { 41 46 INTEL_EG20T_PCH, 42 47 OKISEMI_ML7223m_IOH, /* LAPIS Semiconductor ML7223 IOH PCIe Bus-m */ ··· 430 425 static SIMPLE_DEV_PM_OPS(pch_gpio_pm_ops, pch_gpio_suspend, pch_gpio_resume); 431 426 432 427 static const struct pci_device_id pch_gpio_pcidev_id[] = { 433 - { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803), 434 - .driver_data = INTEL_EG20T_PCH }, 435 - { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014), 436 - .driver_data = OKISEMI_ML7223m_IOH }, 437 - { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043), 438 - .driver_data = OKISEMI_ML7223n_IOH }, 439 - { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803), 440 - .driver_data = INTEL_EG20T_PCH }, 441 - { 0, } 428 + { PCI_DEVICE_DATA(INTEL, EG20T_PCH, INTEL_EG20T_PCH) }, 429 + { PCI_DEVICE_DATA(ROHM, ML7223m_IOH, OKISEMI_ML7223m_IOH) }, 430 + { PCI_DEVICE_DATA(ROHM, ML7223n_IOH, OKISEMI_ML7223n_IOH) }, 431 + { PCI_DEVICE_DATA(ROHM, EG20T_PCH, INTEL_EG20T_PCH) }, 432 + { } 442 433 }; 443 434 MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id); 444 435