usb: dwc3: pci: Change PCI device macros
Subsystems (2)
PATCH 1/1 usb: dwc3: pci: Change PCI device macros
Use PCI_DEVICE_DATA() macro. No functional changes are expected.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/usb/dwc3/dwc3-pci.c | 132 ++++++++++-------------------------- 1 file changed, 34 insertions(+), 98 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +34 -98
@@ -387,104 +387,40 @@ static void dwc3_pci_remove(struct pci_dev *pci) }static const struct pci_device_id dwc3_pci_id_table[] = { - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_BSW ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_BYT ), - (kernel_ulong_t) &dwc3_pci_intel_byt_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD ), - (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_CMLLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_CMLH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_SPTLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_SPTH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_BXT ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_BXT_M ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_APL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_KBP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_GLK ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_CNPLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_CNPH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_CNPV ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ICLLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_EHL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_TGPLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_TGPH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_JSP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ADL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ADL_PCH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ADLN ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ADLN_PCH ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ADLS ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_RPL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_RPLS ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MTLM ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MTLP ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MTL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_TGL ), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_NL_USB ), - (kernel_ulong_t) &dwc3_pci_amd_swnode, }, - - {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_MR ), - (kernel_ulong_t)&dwc3_pci_amd_mr_swnode, }, + {PCI_DEVICE_DATA (INTEL ,BSW , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,BYT , &dwc3_pci_intel_byt_swnode) }, + {PCI_DEVICE_DATA (INTEL ,MRFLD , &dwc3_pci_intel_mrfld_swnode) }, + {PCI_DEVICE_DATA (INTEL ,CMLLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,CMLH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,SPTLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,SPTH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,BXT , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,BXT_M , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,APL , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,KBP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,GLK , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,CNPLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,CNPH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,CNPV , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ICLLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,EHL , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,TGPLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,TGPH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,JSP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ADL , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ADL_PCH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ADLN , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ADLN_PCH , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,ADLS , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,RPL , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,RPLS , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,MTLM , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,MTLP , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,MTL , &dwc3_pci_intel_swnode) }, + {PCI_DEVICE_DATA (INTEL ,TGL , &dwc3_pci_intel_swnode) }, + + {PCI_DEVICE_DATA (AMD ,NL_USB , &dwc3_pci_amd_swnode) }, + {PCI_DEVICE_DATA (AMD ,MR , &dwc3_pci_amd_mr_swnode) }, { }/* Terminating Entry */ };
Signature · 1 line
2.40.0.1.gaa8946217a0b