nfc: Use named initializers for struct i2c_device_id

While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.

While touching all these arrays, unify usage of whitespace in the list
terminator.

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

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Link: https://patch.msgid.link/20260518133311.644160-2-u.kleine-koenig@baylibre.com
Signed-off-by: David Heidelberg <david@ixit.cz>
This commit is contained in:
Uwe Kleine-König (The Capable Hub) 2026-05-18 15:33:11 +02:00 committed by David Heidelberg
parent 2d78676b1f
commit 567ab7727a
No known key found for this signature in database
GPG Key ID: 60023FC4D3492072
8 changed files with 15 additions and 15 deletions

View File

@ -276,7 +276,7 @@ static void microread_i2c_remove(struct i2c_client *client)
}
static const struct i2c_device_id microread_i2c_id[] = {
{ MICROREAD_I2C_DRIVER_NAME },
{ .name = MICROREAD_I2C_DRIVER_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, microread_i2c_id);

View File

@ -252,8 +252,8 @@ 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" },
{}
{ .name = "nfcmrvl_i2c" },
{ }
};
MODULE_DEVICE_TABLE(i2c, nfcmrvl_i2c_id_table);

View File

@ -349,8 +349,8 @@ static void nxp_nci_i2c_remove(struct i2c_client *client)
}
static const struct i2c_device_id nxp_nci_i2c_id_table[] = {
{ "nxp-nci_i2c" },
{}
{ .name = "nxp-nci_i2c" },
{ }
};
MODULE_DEVICE_TABLE(i2c, nxp_nci_i2c_id_table);

View File

@ -249,8 +249,8 @@ 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 },
{}
{ .name = PN533_I2C_DRIVER_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, pn533_i2c_id_table);

View File

@ -44,8 +44,8 @@
PN544_HCI_I2C_LLC_MAX_PAYLOAD)
static const struct i2c_device_id pn544_hci_i2c_id_table[] = {
{ "pn544" },
{}
{ .name = "pn544" },
{ }
};
MODULE_DEVICE_TABLE(i2c, pn544_hci_i2c_id_table);

View File

@ -205,8 +205,8 @@ static void s3fwrn5_i2c_remove(struct i2c_client *client)
}
static const struct i2c_device_id s3fwrn5_i2c_id_table[] = {
{ S3FWRN5_I2C_DRIVER_NAME },
{}
{ .name = S3FWRN5_I2C_DRIVER_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, s3fwrn5_i2c_id_table);

View File

@ -257,8 +257,8 @@ 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 },
{}
{ .name = ST_NCI_DRIVER_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, st_nci_i2c_id_table);

View File

@ -572,8 +572,8 @@ 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 },
{}
{ .name = ST21NFCA_HCI_DRIVER_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, st21nfca_hci_i2c_id_table);