mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 08:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

nfc: Unify style of of_device_id arrays

Browse Source 
The most common style treewide is:

 - A single space in the list terminator and no trailing ,
 - No comma after a named initializers iff the closing } is on the same
   line

Adapt the of_device_id arrays accordingly.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Ian Ray <ian.ray@gehealthcare.com>
Link: https://patch.msgid.link/583375dcd834f5edf6241b09cdd75ad4f32af668.1783091699.git.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-07-03 17:46:22 +02:00
committed by David Heidelberg
parent 777fd2dab4
commit ce2d85e3d2
13 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nfc/nfcmrvl/i2c.c
View File

@@ -246,8 +246,8 @@ static void nfcmrvl_i2c_remove(struct i2c_client *client)
static const struct of_device_id of_nfcmrvl_i2c_match[] = {
{ .compatible = "marvell,nfc-i2c", },
{},
{ .compatible = "marvell,nfc-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_nfcmrvl_i2c_match);

4
drivers/nfc/nfcmrvl/spi.c
View File

@@ -186,8 +186,8 @@ static void nfcmrvl_spi_remove(struct spi_device *spi)
}
static const struct of_device_id of_nfcmrvl_spi_match[] = {
{ .compatible = "marvell,nfc-spi", },
{},
{ .compatible = "marvell,nfc-spi" },
{ }
};
MODULE_DEVICE_TABLE(of, of_nfcmrvl_spi_match);

4
drivers/nfc/nxp-nci/i2c.c
View File

@@ -357,8 +357,8 @@ static const struct i2c_device_id nxp_nci_i2c_id_table[] = {
MODULE_DEVICE_TABLE(i2c, nxp_nci_i2c_id_table);
static const struct of_device_id of_nxp_nci_i2c_match[] = {
{ .compatible = "nxp,nxp-nci-i2c", },
{}
{ .compatible = "nxp,nxp-nci-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_nxp_nci_i2c_match);

8
drivers/nfc/pn533/i2c.c
View File

@@ -237,14 +237,14 @@ static void pn533_i2c_remove(struct i2c_client *client)
}
static const struct of_device_id of_pn533_i2c_match[] = {
{ .compatible = "nxp,pn532", },
{ .compatible = "nxp,pn532" },
/*
* NOTE: The use of the compatibles with the trailing "...-i2c" is
* deprecated and will be removed.
*/
{ .compatible = "nxp,pn533-i2c", },
{ .compatible = "nxp,pn532-i2c", },
{},
{ .compatible = "nxp,pn533-i2c" },
{ .compatible = "nxp,pn532-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_pn533_i2c_match);

4
drivers/nfc/pn533/uart.c
View File

@@ -238,8 +238,8 @@ static const struct serdev_device_ops pn532_serdev_ops = {
};
static const struct of_device_id pn532_uart_of_match[] = {
{ .compatible = "nxp,pn532", },
{},
{ .compatible = "nxp,pn532" },
{ }
};
MODULE_DEVICE_TABLE(of, pn532_uart_of_match);

4
drivers/nfc/pn544/i2c.c
View File

@@ -938,8 +938,8 @@ static void pn544_hci_i2c_remove(struct i2c_client *client)
}
static const struct of_device_id of_pn544_i2c_match[] = {
{ .compatible = "nxp,pn544-i2c", },
{},
{ .compatible = "nxp,pn544-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_pn544_i2c_match);

4
drivers/nfc/s3fwrn5/i2c.c
View File

@@ -211,8 +211,8 @@ static const struct i2c_device_id s3fwrn5_i2c_id_table[] = {
MODULE_DEVICE_TABLE(i2c, s3fwrn5_i2c_id_table);
static const struct of_device_id of_s3fwrn5_i2c_match[] = {
{ .compatible = "samsung,s3fwrn5-i2c", },
{}
{ .compatible = "samsung,s3fwrn5-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_s3fwrn5_i2c_match);

4
drivers/nfc/s3fwrn5/uart.c
View File

@@ -85,8 +85,8 @@ static const struct serdev_device_ops s3fwrn82_serdev_ops = {
};
static const struct of_device_id s3fwrn82_uart_of_match[] = {
{ .compatible = "samsung,s3fwrn82", },
{},
{ .compatible = "samsung,s3fwrn82" },
{ }
};
MODULE_DEVICE_TABLE(of, s3fwrn82_uart_of_match);

8
drivers/nfc/st-nci/i2c.c
View File

@@ -270,10 +270,10 @@ static const struct acpi_device_id st_nci_i2c_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, st_nci_i2c_acpi_match);
static const struct of_device_id of_st_nci_i2c_match[] = {
{ .compatible = "st,st21nfcb-i2c", },
{ .compatible = "st,st21nfcb_i2c", },
{ .compatible = "st,st21nfcc-i2c", },
{}
{ .compatible = "st,st21nfcb-i2c" },
{ .compatible = "st,st21nfcb_i2c" },
{ .compatible = "st,st21nfcc-i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_st_nci_i2c_match);

4
drivers/nfc/st-nci/spi.c
View File

@@ -284,8 +284,8 @@ static const struct acpi_device_id st_nci_spi_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, st_nci_spi_acpi_match);
static const struct of_device_id of_st_nci_spi_match[] = {
{ .compatible = "st,st21nfcb-spi", },
{}
{ .compatible = "st,st21nfcb-spi" },
{ }
};
MODULE_DEVICE_TABLE(of, of_st_nci_spi_match);

6
drivers/nfc/st21nfca/i2c.c
View File

@@ -584,9 +584,9 @@ static const struct acpi_device_id st21nfca_hci_i2c_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, st21nfca_hci_i2c_acpi_match);
static const struct of_device_id of_st21nfca_i2c_match[] = {
{ .compatible = "st,st21nfca-i2c", },
{ .compatible = "st,st21nfca_i2c", },
{}
{ .compatible = "st,st21nfca-i2c" },
{ .compatible = "st,st21nfca_i2c" },
{ }
};
MODULE_DEVICE_TABLE(of, of_st21nfca_i2c_match);

2
drivers/nfc/st95hf/core.c
View File

@@ -1056,7 +1056,7 @@ MODULE_DEVICE_TABLE(spi, st95hf_id);
static const struct of_device_id st95hf_spi_of_match[] = {
{ .compatible = "st,st95hf" },
{},
{ }
};
MODULE_DEVICE_TABLE(of, st95hf_spi_of_match);

5
drivers/nfc/trf7970a.c
View File

@@ -2304,10 +2304,9 @@ static const struct dev_pm_ops trf7970a_pm_ops = {
};
static const struct of_device_id trf7970a_of_match[] = {
{.compatible = "ti,trf7970a",},
{},
{ .compatible = "ti,trf7970a" },
{ }
};
MODULE_DEVICE_TABLE(of, trf7970a_of_match);
static const struct spi_device_id trf7970a_id_table[] = {