github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i2c: designware-pcidrv: Consistently define pci_device_ids using named initializers

Browse Source 
The .driver_data member of the struct pci_device_id array were
initialized by list expressions. This isn't easily readable if you're
not into PCI. Using named initializers is more explicit and thus easier
to parse.

This change doesn't introduce changes to the compiled pci_device_id
array. Tested on x86 and arm64.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/68667c4ab85716b190d8b705813b610e21a386f6.1779481436.git.u.kleine-koenig@baylibre.com
This commit is contained in:
Uwe Kleine-König (The Capable Hub) 2026-05-22 22:35:13 +02:00 committed by Andi Shyti
parent cdf12d8025
commit 4414724548
No known key found for this signature in database
GPG Key ID: DA78056626D32D6E
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/i2c/busses/i2c-designware-pcidrv.c
View File

@ -308,51 +308,51 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)
static const struct pci_device_id i2c_designware_pci_ids[] = {
/* Medfield */
{ PCI_VDEVICE(INTEL, 0x0817), medfield },
{ PCI_VDEVICE(INTEL, 0x0818), medfield },
{ PCI_VDEVICE(INTEL, 0x0819), medfield },
{ PCI_VDEVICE(INTEL, 0x082C), medfield },
{ PCI_VDEVICE(INTEL, 0x082D), medfield },
{ PCI_VDEVICE(INTEL, 0x082E), medfield },
{ PCI_VDEVICE(INTEL, 0x0817), .driver_data = medfield },
{ PCI_VDEVICE(INTEL, 0x0818), .driver_data = medfield },
{ PCI_VDEVICE(INTEL, 0x0819), .driver_data = medfield },
{ PCI_VDEVICE(INTEL, 0x082C), .driver_data = medfield },
{ PCI_VDEVICE(INTEL, 0x082D), .driver_data = medfield },
{ PCI_VDEVICE(INTEL, 0x082E), .driver_data = medfield },
/* Merrifield */
{ PCI_VDEVICE(INTEL, 0x1195), merrifield },
{ PCI_VDEVICE(INTEL, 0x1196), merrifield },
{ PCI_VDEVICE(INTEL, 0x1195), .driver_data = merrifield },
{ PCI_VDEVICE(INTEL, 0x1196), .driver_data = merrifield },
/* Baytrail */
{ PCI_VDEVICE(INTEL, 0x0F41), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F42), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F43), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F44), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F45), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F46), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F47), baytrail },
{ PCI_VDEVICE(INTEL, 0x0F41), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F42), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F43), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F44), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F45), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F46), .driver_data = baytrail },
{ PCI_VDEVICE(INTEL, 0x0F47), .driver_data = baytrail },
/* Haswell */
{ PCI_VDEVICE(INTEL, 0x9c61), haswell },
{ PCI_VDEVICE(INTEL, 0x9c62), haswell },
{ PCI_VDEVICE(INTEL, 0x9c61), .driver_data = haswell },
{ PCI_VDEVICE(INTEL, 0x9c62), .driver_data = haswell },
/* Braswell / Cherrytrail */
{ PCI_VDEVICE(INTEL, 0x22C1), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C2), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C3), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C4), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C5), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C6), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C7), cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C1), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C2), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C3), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C4), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C5), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C6), .driver_data = cherrytrail },
{ PCI_VDEVICE(INTEL, 0x22C7), .driver_data = cherrytrail },
/* Elkhart Lake (PSE I2C) */
{ PCI_VDEVICE(INTEL, 0x4bb9), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bba), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbb), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbc), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbd), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbe), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbf), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bc0), elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bb9), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bba), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbb), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbc), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbd), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbe), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bbf), .driver_data = elkhartlake },
{ PCI_VDEVICE(INTEL, 0x4bc0), .driver_data = elkhartlake },
/* AMD NAVI */
{ PCI_VDEVICE(ATI, 0x7314), navi_amd },
{ PCI_VDEVICE(ATI, 0x73a4), navi_amd },
{ PCI_VDEVICE(ATI, 0x73e4), navi_amd },
{ PCI_VDEVICE(ATI, 0x73c4), navi_amd },
{ PCI_VDEVICE(ATI, 0x7444), navi_amd },
{ PCI_VDEVICE(ATI, 0x7464), navi_amd },
{}
{ PCI_VDEVICE(ATI, 0x7314), .driver_data = navi_amd },
{ PCI_VDEVICE(ATI, 0x73a4), .driver_data = navi_amd },
{ PCI_VDEVICE(ATI, 0x73e4), .driver_data = navi_amd },
{ PCI_VDEVICE(ATI, 0x73c4), .driver_data = navi_amd },
{ PCI_VDEVICE(ATI, 0x7444), .driver_data = navi_amd },
{ PCI_VDEVICE(ATI, 0x7464), .driver_data = navi_amd },
{ }
};
MODULE_DEVICE_TABLE(pci, i2c_designware_pci_ids);