From 23096d984885af49ac64b18b2d245fbd71b6c0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= Date: Fri, 3 Jul 2026 17:46:16 +0200 Subject: [PATCH] nfc: Drop unused assignment of acpi_device_id driver data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The drivers explicitly set the .driver_data member of struct acpi_device_id to zero without relying on that value. Drop these unused assignments. This patch doesn't modify the compiled arrays, only their representation in source form benefits. Signed-off-by: Uwe Kleine-König (The Capable Hub) Link: https://patch.msgid.link/c77f6376214001297f28d3ec48f0a853985f1847.1783091699.git.u.kleine-koenig@baylibre.com Signed-off-by: David Heidelberg --- drivers/nfc/fdp/i2c.c | 2 +- drivers/nfc/pn544/i2c.c | 3 +-- drivers/nfc/st-nci/spi.c | 2 +- drivers/nfc/st21nfca/i2c.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index c1896a1d978c..9d589b388432 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c @@ -349,7 +349,7 @@ static void fdp_nci_i2c_remove(struct i2c_client *client) } static const struct acpi_device_id fdp_nci_i2c_acpi_match[] = { - {"INT339A", 0}, + { "INT339A" }, {} }; MODULE_DEVICE_TABLE(acpi, fdp_nci_i2c_acpi_match); diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index 419b014d232e..66d070b18b4d 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -51,10 +51,9 @@ static const struct i2c_device_id pn544_hci_i2c_id_table[] = { MODULE_DEVICE_TABLE(i2c, pn544_hci_i2c_id_table); static const struct acpi_device_id pn544_hci_i2c_acpi_match[] = { - {"NXP5440", 0}, + { "NXP5440" }, {} }; - MODULE_DEVICE_TABLE(acpi, pn544_hci_i2c_acpi_match); #define PN544_HCI_I2C_DRIVER_NAME "pn544_hci_i2c" diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c index 42f5f477e807..c94d67f33184 100644 --- a/drivers/nfc/st-nci/spi.c +++ b/drivers/nfc/st-nci/spi.c @@ -278,7 +278,7 @@ static struct spi_device_id st_nci_spi_id_table[] = { MODULE_DEVICE_TABLE(spi, st_nci_spi_id_table); static const struct acpi_device_id st_nci_spi_acpi_match[] = { - {"SMO2101", 0}, + { "SMO2101" }, {} }; MODULE_DEVICE_TABLE(acpi, st_nci_spi_acpi_match); diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 577434df5ff3..d6cb74a89f93 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -578,7 +578,7 @@ static const struct i2c_device_id st21nfca_hci_i2c_id_table[] = { MODULE_DEVICE_TABLE(i2c, st21nfca_hci_i2c_id_table); static const struct acpi_device_id st21nfca_hci_i2c_acpi_match[] = { - {"SMO2100", 0}, + { "SMO2100" }, {} }; MODULE_DEVICE_TABLE(acpi, st21nfca_hci_i2c_acpi_match);