[PATCH v2 03/12] misc: genwqe: Drop unused assignment of pci_device_id driver data
From: Uwe Kleine-König (The Capable Hub)
Date: Fri Jul 17 2026 - 10:54:20 EST
The driver explicitly sets the .driver_data member of struct
pci_device_id to zero without relying on that value. Drop this unused
assignment.
While touching this array, also convert it to use one of the PCI_DEVICE
macros that is usually used for these and drop the explicit 0 in the
list terminator. This patch doesn't modify the compiled array.
Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@xxxxxxxxxxxx>
---
drivers/misc/genwqe/card_base.c | 88 +++++++++++++--------------------
1 file changed, 35 insertions(+), 53 deletions(-)
diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 86bfa82723ff..e602eb3c51fa 100644
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -48,60 +48,42 @@ static struct genwqe_dev *genwqe_devices[GENWQE_CARD_NO_MAX];
/* PCI structure for identifying device by PCI vendor and device ID */
static const struct pci_device_id genwqe_device_table[] = {
- { .vendor = PCI_VENDOR_ID_IBM,
- .device = PCI_DEVICE_GENWQE,
- .subvendor = PCI_SUBVENDOR_ID_IBM,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5,
- .class = (PCI_CLASSCODE_GENWQE5 << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- /* Initial SR-IOV bring-up image */
- { .vendor = PCI_VENDOR_ID_IBM,
- .device = PCI_DEVICE_GENWQE,
- .subvendor = PCI_SUBVENDOR_ID_IBM_SRIOV,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5_SRIOV,
- .class = (PCI_CLASSCODE_GENWQE5_SRIOV << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- { .vendor = PCI_VENDOR_ID_IBM, /* VF Vendor ID */
- .device = 0x0000, /* VF Device ID */
- .subvendor = PCI_SUBVENDOR_ID_IBM_SRIOV,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5_SRIOV,
- .class = (PCI_CLASSCODE_GENWQE5_SRIOV << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- /* Fixed up image */
- { .vendor = PCI_VENDOR_ID_IBM,
- .device = PCI_DEVICE_GENWQE,
- .subvendor = PCI_SUBVENDOR_ID_IBM_SRIOV,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5,
- .class = (PCI_CLASSCODE_GENWQE5_SRIOV << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- { .vendor = PCI_VENDOR_ID_IBM, /* VF Vendor ID */
- .device = 0x0000, /* VF Device ID */
- .subvendor = PCI_SUBVENDOR_ID_IBM_SRIOV,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5,
- .class = (PCI_CLASSCODE_GENWQE5_SRIOV << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- /* Even one more ... */
- { .vendor = PCI_VENDOR_ID_IBM,
- .device = PCI_DEVICE_GENWQE,
- .subvendor = PCI_SUBVENDOR_ID_IBM,
- .subdevice = PCI_SUBSYSTEM_ID_GENWQE5_NEW,
- .class = (PCI_CLASSCODE_GENWQE5 << 8),
- .class_mask = ~0,
- .driver_data = 0 },
-
- { 0, } /* 0 terminated list. */
+ {
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, PCI_DEVICE_GENWQE,
+ PCI_SUBVENDOR_ID_IBM, PCI_SUBSYSTEM_ID_GENWQE5),
+ .class = PCI_CLASSCODE_GENWQE5 << 8,
+ .class_mask = ~0,
+ }, {
+ /* Initial SR-IOV bring-up image */
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, PCI_VENDOR_ID_IBM, PCI_DEVICE_GENWQE,
+ PCI_SUBVENDOR_ID_IBM_SRIOV),
+ .class = PCI_CLASSCODE_GENWQE5_SRIOV << 8,
+ .class_mask = ~0,
+ }, {
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, 0x0000,
+ PCI_SUBVENDOR_ID_IBM_SRIOV, PCI_SUBSYSTEM_ID_GENWQE5_SRIOV),
+ .class = PCI_CLASSCODE_GENWQE5_SRIOV << 8,
+ .class_mask = ~0,
+ }, {
+ /* Fixed up image */
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, PCI_DEVICE_GENWQE,
+ PCI_SUBVENDOR_ID_IBM_SRIOV, PCI_SUBSYSTEM_ID_GENWQE5),
+ .class = PCI_CLASSCODE_GENWQE5_SRIOV << 8,
+ .class_mask = ~0,
+ }, {
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, 0x0000,
+ PCI_SUBVENDOR_ID_IBM_SRIOV, PCI_SUBSYSTEM_ID_GENWQE5),
+ .class = PCI_CLASSCODE_GENWQE5_SRIOV << 8,
+ .class_mask = ~0,
+ }, {
+ /* Even one more ... */
+ PCI_DEVICE_SUB(PCI_VENDOR_ID_IBM, PCI_DEVICE_GENWQE,
+ PCI_SUBVENDOR_ID_IBM, PCI_SUBSYSTEM_ID_GENWQE5_NEW),
+ .class = (PCI_CLASSCODE_GENWQE5 << 8),
+ .class_mask = ~0,
+ },
+ { } /* 0 terminated list. */
};
-
MODULE_DEVICE_TABLE(pci, genwqe_device_table);
/**
--
2.55.0.11.g153666a7d9bb