mmc: via-sdmmc: Simplify initialisation of pci_device_id array

Instead of assigning the pci_device_id members using a list (which is
hard to read as you need to look at the order of the members in that
struct in parallel) use the PCI_VDEVICE() convenience macro to compact
the initialisation while improving readability.

Also drop trailing zeros that the compiler will care about then.

The change doesn't introduce binary changes to the compiled driver,
verified on both ARCH=x86 and ARCH=arm64.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index c628b3bbfd7aad7508f7e96c1c5891fe69c327ba..8c049f8355cdf9ebd1d33791ec1fadcd1de459fc 100644 (file)
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -323,9 +323,8 @@ struct via_crdr_mmc_host {
 #define VIA_CMD_TIMEOUT_MS             1000
 
 static const struct pci_device_id via_ids[] = {
-       {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_9530,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
-       {0,}
+       { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_9530) },
+       { }
 };
 
 MODULE_DEVICE_TABLE(pci, via_ids);