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

ata: Drop unused assignments of pci_device_id driver data

Browse Source 
The drivers explicitly set the .driver_data member of struct
pci_device_id to zero without relying on that value. Drop these unused
assignments.

While touching these arrays, convert the one driver not using PCI_DEVICE
to use that macro and align the array's coding style to what is used
most for these. (i.e. break very long lines, a single space in the list
terminator and no trailing comma.)

This patch doesn't modify the compiled array, only its representation in
source form benefits. The former was confirmed with builds on x86 and
arm64.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
This commit is contained in:
Uwe Kleine-König (The Capable Hub) 2026-06-12 10:21:47 +02:00 committed by Niklas Cassel
parent c62aff1174
commit 3b5b35f28e
7 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ata/pata_atp867x.c
View File

@ -526,9 +526,9 @@ static int atp867x_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id atp867x_pci_tbl[] = {
{ PCI_VDEVICE(ARTOP, PCI_DEVICE_ID_ARTOP_ATP867A), 0 },
{ PCI_VDEVICE(ARTOP, PCI_DEVICE_ID_ARTOP_ATP867B), 0 },
{ },
{ PCI_VDEVICE(ARTOP, PCI_DEVICE_ID_ARTOP_ATP867A) },
{ PCI_VDEVICE(ARTOP, PCI_DEVICE_ID_ARTOP_ATP867B) },
{ }
};
static struct pci_driver atp867x_driver = {

4
drivers/ata/pata_cmd640.c
View File

@ -248,8 +248,8 @@ static int cmd640_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id cmd640[] = {
{ PCI_VDEVICE(CMD, 0x640), 0 },
{ },
{ PCI_VDEVICE(CMD, 0x0640) },
{ }
};
static struct pci_driver cmd640_pci_driver = {

7
drivers/ata/pata_jmicron.c
View File

@ -148,8 +148,11 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
}
static const struct pci_device_id jmicron_pci_tbl[] = {
{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
{
PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID),
.class = PCI_CLASS_STORAGE_IDE << 8,
.class_mask = 0xffff00
},
{ } /* terminate list */
};

12
drivers/ata/pata_macio.c
View File

@ -1368,12 +1368,12 @@ static struct macio_driver pata_macio_driver =
};
static const struct pci_device_id pata_macio_pci_match[] = {
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA), 0 },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100), 0 },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100), 0 },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_SH_ATA), 0 },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA), 0 },
{},
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_ATA) },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID_ATA100) },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_K2_ATA100) },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_SH_ATA) },
{ PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID2_ATA) },
{ }
};
static struct pci_driver pata_macio_pci_driver = {

14
drivers/ata/pata_ninja32.c
View File

@ -166,13 +166,13 @@ static int ninja32_reinit_one(struct pci_dev *pdev)
#endif
static const struct pci_device_id ninja32[] = {
{ 0x10FC, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1145, 0x8008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1145, 0xf008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1145, 0xf02C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ },
{ PCI_DEVICE(0x10FC, 0x0003) },
{ PCI_DEVICE(0x1145, 0x8008) },
{ PCI_DEVICE(0x1145, 0xf008) },
{ PCI_DEVICE(0x1145, 0xf021) },
{ PCI_DEVICE(0x1145, 0xf024) },
{ PCI_DEVICE(0x1145, 0xf02C) },
{ }
};
static struct pci_driver ninja32_pci_driver = {

2
drivers/ata/pata_sch.c
View File

@ -42,7 +42,7 @@ static void sch_set_dmamode(struct ata_port *ap, struct ata_device *adev);
static const struct pci_device_id sch_pci_tbl[] = {
/* Intel SCH PATA Controller */
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_IDE), 0 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SCH_IDE) },
{ } /* terminate list */
};

14
drivers/ata/sata_vsc.c
View File

@ -400,11 +400,15 @@ static int vsc_sata_init_one(struct pci_dev *pdev,
}
static const struct pci_device_id vsc_sata_pci_tbl[] = {
{ PCI_VENDOR_ID_VITESSE, 0x7174,
PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
{ PCI_VENDOR_ID_INTEL, 0x3200,
PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 },
{
PCI_DEVICE(PCI_VENDOR_ID_VITESSE, 0x7174),
.class = 0x10600,
.class_mask = 0xFFFFFF,
}, {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3200),
.class = 0x10600,
.class_mask = 0xFFFFFF,
},
{ } /* terminate list */
};