u32     reset;
 };
 
+#define PCI_DEVICE_ID_INTEL_EG20T_PCH          0x8803
+#define PCI_DEVICE_ID_ROHM_ML7223m_IOH         0x8014
+#define PCI_DEVICE_ID_ROHM_ML7223n_IOH         0x8043
+#define PCI_DEVICE_ID_ROHM_EG20T_PCH           0x8803
+
 enum pch_type_t {
        INTEL_EG20T_PCH,
        OKISEMI_ML7223m_IOH, /* LAPIS Semiconductor ML7223 IOH PCIe Bus-m */
 static SIMPLE_DEV_PM_OPS(pch_gpio_pm_ops, pch_gpio_suspend, pch_gpio_resume);
 
 static const struct pci_device_id pch_gpio_pcidev_id[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8803),
-         .driver_data = INTEL_EG20T_PCH },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8014),
-         .driver_data = OKISEMI_ML7223m_IOH },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8043),
-         .driver_data = OKISEMI_ML7223n_IOH },
-       { PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8803),
-         .driver_data = INTEL_EG20T_PCH },
-       { 0, }
+       { PCI_DEVICE_DATA(INTEL, EG20T_PCH, INTEL_EG20T_PCH) },
+       { PCI_DEVICE_DATA(ROHM, ML7223m_IOH, OKISEMI_ML7223m_IOH) },
+       { PCI_DEVICE_DATA(ROHM, ML7223n_IOH, OKISEMI_ML7223n_IOH) },
+       { PCI_DEVICE_DATA(ROHM, EG20T_PCH, INTEL_EG20T_PCH) },
+       { }
 };
 MODULE_DEVICE_TABLE(pci, pch_gpio_pcidev_id);