Re: [PATCH v1 08/12] nfc: Unify style of of_device_id arrays

On Fri, Jul 03, 2026 at 05:46:22PM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> 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) <[email protected]>

Reviewed-by: Ian Ray <[email protected]>

> ---
>  drivers/nfc/nfcmrvl/i2c.c  | 4 ++--
>  drivers/nfc/nfcmrvl/spi.c  | 4 ++--
>  drivers/nfc/nxp-nci/i2c.c  | 4 ++--
>  drivers/nfc/pn533/i2c.c    | 8 ++++----
>  drivers/nfc/pn533/uart.c   | 4 ++--
>  drivers/nfc/pn544/i2c.c    | 4 ++--
>  drivers/nfc/s3fwrn5/i2c.c  | 4 ++--
>  drivers/nfc/s3fwrn5/uart.c | 4 ++--
>  drivers/nfc/st-nci/i2c.c   | 8 ++++----
>  drivers/nfc/st-nci/spi.c   | 4 ++--
>  drivers/nfc/st21nfca/i2c.c | 6 +++---
>  drivers/nfc/st95hf/core.c  | 2 +-
>  drivers/nfc/trf7970a.c     | 5 ++---
>  13 files changed, 30 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
> index 687d2979b881..068c5d278a35 100644
> --- a/drivers/nfc/nfcmrvl/i2c.c
> +++ b/drivers/nfc/nfcmrvl/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
> index 8dd71fed8493..34842ecc4a05 100644
> --- a/drivers/nfc/nfcmrvl/spi.c
> +++ b/drivers/nfc/nfcmrvl/spi.c
> @@ -182,8 +182,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);
> 
> diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
> index 39b43f8f3bf0..d424452934ec 100644
> --- a/drivers/nfc/nxp-nci/i2c.c
> +++ b/drivers/nfc/nxp-nci/i2c.c
> @@ -355,8 +355,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);
> 
> diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c
> index 2128083f0297..66d201c14a40 100644
> --- a/drivers/nfc/pn533/i2c.c
> +++ b/drivers/nfc/pn533/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c
> index e0d67cd2ac9b..83c1ccda0af6 100644
> --- a/drivers/nfc/pn533/uart.c
> +++ b/drivers/nfc/pn533/uart.c
> @@ -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);
> 
> diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
> index 50907a1974cd..7fde3aefae70 100644
> --- a/drivers/nfc/pn544/i2c.c
> +++ b/drivers/nfc/pn544/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c
> index 499301a6fa3f..4ba762611711 100644
> --- a/drivers/nfc/s3fwrn5/i2c.c
> +++ b/drivers/nfc/s3fwrn5/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/s3fwrn5/uart.c b/drivers/nfc/s3fwrn5/uart.c
> index e17c599a2da5..8f142a255101 100644
> --- a/drivers/nfc/s3fwrn5/uart.c
> +++ b/drivers/nfc/s3fwrn5/uart.c
> @@ -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);
> 
> diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
> index ceb7d7450e47..152c20b6bb01 100644
> --- a/drivers/nfc/st-nci/i2c.c
> +++ b/drivers/nfc/st-nci/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
> index 8632cc0cb305..5e0b94050f90 100644
> --- a/drivers/nfc/st-nci/spi.c
> +++ b/drivers/nfc/st-nci/spi.c
> @@ -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);
> 
> diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
> index 4e70f591af55..a4c93ff7c5b0 100644
> --- a/drivers/nfc/st21nfca/i2c.c
> +++ b/drivers/nfc/st21nfca/i2c.c
> @@ -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);
> 
> diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
> index 1ecd47c6518e..265ab10bbb61 100644
> --- a/drivers/nfc/st95hf/core.c
> +++ b/drivers/nfc/st95hf/core.c
> @@ -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);
> 
> diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
> index bc01b46f461c..3802081fb8ee 100644
> --- a/drivers/nfc/trf7970a.c
> +++ b/drivers/nfc/trf7970a.c
> @@ -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[] = {
> --
> 2.55.0.11.g153666a7d9bb
>