nfc: Drop explicit initialization of struct i2c_device_id::driver_data to 0

These drivers don't use the driver_data member of struct i2c_device_id,
so don't explicitly initialize this member.

This prepares putting driver_data in an anonymous union which requires
either no initialization or named designators. But it's also a nice
cleanup on its own.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240619195631.2545407-2-u.kleine-koenig@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c
index 642df4e0ce24a6697d76e7729fd9683f2907b9db..113b2e306e3560dde8b9f2cd526418afa3862539 100644 (file)
--- a/drivers/nfc/microread/i2c.c
+++ b/drivers/nfc/microread/i2c.c
@@ -277,7 +277,7 @@ static void microread_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id microread_i2c_id[] = {
-       { MICROREAD_I2C_DRIVER_NAME, 0},
+       { MICROREAD_I2C_DRIVER_NAME },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, microread_i2c_id);

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 74553134c1b1892d67d1439a8c7a29f54885edb7..39ecf2aeda805ce9c2711a0cfbd4b5c5d166d1b3 100644 (file)
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -252,7 +252,7 @@ static const struct of_device_id of_nfcmrvl_i2c_match[] __maybe_unused = {
 MODULE_DEVICE_TABLE(of, of_nfcmrvl_i2c_match);
 
 static const struct i2c_device_id nfcmrvl_i2c_id_table[] = {
-       { "nfcmrvl_i2c", 0 },
+       { "nfcmrvl_i2c" },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, nfcmrvl_i2c_id_table);

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index 3ae4b41c59ac3d64c77fe9479c303756e0b441bb..a8aced0b801004754a109568b5030c8061bdcedc 100644 (file)
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -322,7 +322,7 @@ static void nxp_nci_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id nxp_nci_i2c_id_table[] = {
-       {"nxp-nci_i2c", 0},
+       { "nxp-nci_i2c" },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, nxp_nci_i2c_id_table);

diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
index 438ab9553f7a185180ec58495aa26d4f958eaff8..132c050a365d67b1d6a95eea125a4c85aa92e3df 100644 (file)
--- a/drivers/nfc/pn533/i2c.c
+++ b/drivers/nfc/pn533/i2c.c
@@ -249,7 +249,7 @@ static const struct of_device_id of_pn533_i2c_match[] __maybe_unused = {
 MODULE_DEVICE_TABLE(of, of_pn533_i2c_match);
 
 static const struct i2c_device_id pn533_i2c_id_table[] = {
-       { PN533_I2C_DRIVER_NAME, 0 },
+       { PN533_I2C_DRIVER_NAME },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, pn533_i2c_id_table);

diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 3f6d74832bac3b3d059fce0e8a489a35e2bce8da..9fe664960b38032d74fb6544b998ab1c92e198fc 100644 (file)
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -44,7 +44,7 @@
                                         PN544_HCI_I2C_LLC_MAX_PAYLOAD)
 
 static const struct i2c_device_id pn544_hci_i2c_id_table[] = {
-       {"pn544", 0},
+       { "pn544" },
        {}
 };
 

diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
index 720d4a72493c8096d7dea96d19b46e68f9cf5571..536c566e3f59e4dd0d8e216524752dbaac1f9c74 100644 (file)
--- a/drivers/nfc/s3fwrn5/i2c.c
+++ b/drivers/nfc/s3fwrn5/i2c.c
@@ -245,7 +245,7 @@ static void s3fwrn5_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id s3fwrn5_i2c_id_table[] = {
-       {S3FWRN5_I2C_DRIVER_NAME, 0},
+       { S3FWRN5_I2C_DRIVER_NAME },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, s3fwrn5_i2c_id_table);

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index d20a337e90b45631330771640b2ad8610dcd411e..416770adbebaa7fbca3dd4efa334a24c10c061ef 100644 (file)
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -257,7 +257,7 @@ static void st_nci_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id st_nci_i2c_id_table[] = {
-       {ST_NCI_DRIVER_NAME, 0},
+       { ST_NCI_DRIVER_NAME },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, st_nci_i2c_id_table);

diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index 064a63db288bdc0bd0b5de2b5dea23d6f84c36fb..02c3d11a19c436d6a3607be1f2ff50d13e88bb1e 100644 (file)
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -573,7 +573,7 @@ static void st21nfca_hci_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id st21nfca_hci_i2c_id_table[] = {
-       {ST21NFCA_HCI_DRIVER_NAME, 0},
+       { ST21NFCA_HCI_DRIVER_NAME },
        {}
 };
 MODULE_DEVICE_TABLE(i2c, st21nfca_hci_i2c_id_table);