[PATCH] xilinx: drivers: Use '_' instead of '-' in driver name

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] xilinx: drivers: Use '_' instead of '-' in driver name

Michal Simek-3
The most of drivers are using '_' instead of '-' in driver name. That's why
sync up these names to be aligned. It looks quite bad to see both in use.
It is visible via dm tree command.

Signed-off-by: Michal Simek <[hidden email]>
---

Simon: Not sure what's the standard here but I have done some greps and it
looks like that most of drivers are using _ instead of -.
---
 drivers/clk/clk_zynqmp.c           | 2 +-
 drivers/firmware/firmware-zynqmp.c | 2 +-
 drivers/i2c/i2c-cdns.c             | 2 +-
 drivers/mailbox/zynqmp-ipi.c       | 2 +-
 drivers/mtd/nand/raw/arasan_nfc.c  | 2 +-
 drivers/mtd/nand/raw/zynq_nand.c   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
index 2313ac0bc044..779511975662 100644
--- a/drivers/clk/clk_zynqmp.c
+++ b/drivers/clk/clk_zynqmp.c
@@ -710,7 +710,7 @@ static const struct udevice_id zynqmp_clk_ids[] = {
 };
 
 U_BOOT_DRIVER(zynqmp_clk) = {
- .name = "zynqmp-clk",
+ .name = "zynqmp_clk",
  .id = UCLASS_CLK,
  .of_match = zynqmp_clk_ids,
  .probe = zynqmp_clk_probe,
diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
index 903a8f587820..7583f24a200d 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -202,6 +202,6 @@ static const struct udevice_id zynqmp_firmware_ids[] = {
 
 U_BOOT_DRIVER(zynqmp_firmware) = {
  .id = UCLASS_FIRMWARE,
- .name = "zynqmp-firmware",
+ .name = "zynqmp_firmware",
  .of_match = zynqmp_firmware_ids,
 };
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
index 024c63c4eaed..7144d39984ec 100644
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@@ -500,7 +500,7 @@ static const struct udevice_id cdns_i2c_of_match[] = {
 };
 
 U_BOOT_DRIVER(cdns_i2c) = {
- .name = "i2c-cdns",
+ .name = "i2c_cdns",
  .id = UCLASS_I2C,
  .of_match = cdns_i2c_of_match,
  .ofdata_to_platdata = cdns_i2c_ofdata_to_platdata,
diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index 746377e557cb..9483ed9cefcf 100644
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -133,7 +133,7 @@ struct mbox_ops zynqmp_ipi_mbox_ops = {
 };
 
 U_BOOT_DRIVER(zynqmp_ipi) = {
- .name = "zynqmp-ipi",
+ .name = "zynqmp_ipi",
  .id = UCLASS_MAILBOX,
  .of_match = zynqmp_ipi_ids,
  .probe = zynqmp_ipi_probe,
diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
index 6c1d64054c64..0615e5037809 100644
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@@ -1306,7 +1306,7 @@ static const struct udevice_id arasan_nand_dt_ids[] = {
 };
 
 U_BOOT_DRIVER(arasan_nand) = {
- .name = "arasan-nand",
+ .name = "arasan_nand",
  .id = UCLASS_MTD,
  .of_match = arasan_nand_dt_ids,
  .probe = arasan_probe,
diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index fa594552109d..92db2aa19c86 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1282,7 +1282,7 @@ static const struct udevice_id zynq_nand_dt_ids[] = {
 };
 
 U_BOOT_DRIVER(zynq_nand) = {
- .name = "zynq-nand",
+ .name = "zynq_nand",
  .id = UCLASS_MTD,
  .of_match = zynq_nand_dt_ids,
  .probe = zynq_nand_probe,
--
2.28.0

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] xilinx: drivers: Use '_' instead of '-' in driver name

Simon Glass-3
On Mon, 24 Aug 2020 at 06:15, Michal Simek <[hidden email]> wrote:

>
> The most of drivers are using '_' instead of '-' in driver name. That's why
> sync up these names to be aligned. It looks quite bad to see both in use.
> It is visible via dm tree command.
>
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
> Simon: Not sure what's the standard here but I have done some greps and it
> looks like that most of drivers are using _ instead of -.
> ---
>  drivers/clk/clk_zynqmp.c           | 2 +-
>  drivers/firmware/firmware-zynqmp.c | 2 +-
>  drivers/i2c/i2c-cdns.c             | 2 +-
>  drivers/mailbox/zynqmp-ipi.c       | 2 +-
>  drivers/mtd/nand/raw/arasan_nfc.c  | 2 +-
>  drivers/mtd/nand/raw/zynq_nand.c   | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Simon Glass <[hidden email]>

Bonus points if you can update checkpatch.pl to catch it
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] xilinx: drivers: Use '_' instead of '-' in driver name

Michal Simek-4
In reply to this post by Michal Simek-3
po 24. 8. 2020 v 14:15 odesílatel Michal Simek <[hidden email]> napsal:

>
> The most of drivers are using '_' instead of '-' in driver name. That's why
> sync up these names to be aligned. It looks quite bad to see both in use.
> It is visible via dm tree command.
>
> Signed-off-by: Michal Simek <[hidden email]>
> ---
>
> Simon: Not sure what's the standard here but I have done some greps and it
> looks like that most of drivers are using _ instead of -.
> ---
>  drivers/clk/clk_zynqmp.c           | 2 +-
>  drivers/firmware/firmware-zynqmp.c | 2 +-
>  drivers/i2c/i2c-cdns.c             | 2 +-
>  drivers/mailbox/zynqmp-ipi.c       | 2 +-
>  drivers/mtd/nand/raw/arasan_nfc.c  | 2 +-
>  drivers/mtd/nand/raw/zynq_nand.c   | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c
> index 2313ac0bc044..779511975662 100644
> --- a/drivers/clk/clk_zynqmp.c
> +++ b/drivers/clk/clk_zynqmp.c
> @@ -710,7 +710,7 @@ static const struct udevice_id zynqmp_clk_ids[] = {
>  };
>
>  U_BOOT_DRIVER(zynqmp_clk) = {
> -       .name = "zynqmp-clk",
> +       .name = "zynqmp_clk",
>         .id = UCLASS_CLK,
>         .of_match = zynqmp_clk_ids,
>         .probe = zynqmp_clk_probe,
> diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c
> index 903a8f587820..7583f24a200d 100644
> --- a/drivers/firmware/firmware-zynqmp.c
> +++ b/drivers/firmware/firmware-zynqmp.c
> @@ -202,6 +202,6 @@ static const struct udevice_id zynqmp_firmware_ids[] = {
>
>  U_BOOT_DRIVER(zynqmp_firmware) = {
>         .id = UCLASS_FIRMWARE,
> -       .name = "zynqmp-firmware",
> +       .name = "zynqmp_firmware",
>         .of_match = zynqmp_firmware_ids,
>  };
> diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c
> index 024c63c4eaed..7144d39984ec 100644
> --- a/drivers/i2c/i2c-cdns.c
> +++ b/drivers/i2c/i2c-cdns.c
> @@ -500,7 +500,7 @@ static const struct udevice_id cdns_i2c_of_match[] = {
>  };
>
>  U_BOOT_DRIVER(cdns_i2c) = {
> -       .name = "i2c-cdns",
> +       .name = "i2c_cdns",
>         .id = UCLASS_I2C,
>         .of_match = cdns_i2c_of_match,
>         .ofdata_to_platdata = cdns_i2c_ofdata_to_platdata,
> diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
> index 746377e557cb..9483ed9cefcf 100644
> --- a/drivers/mailbox/zynqmp-ipi.c
> +++ b/drivers/mailbox/zynqmp-ipi.c
> @@ -133,7 +133,7 @@ struct mbox_ops zynqmp_ipi_mbox_ops = {
>  };
>
>  U_BOOT_DRIVER(zynqmp_ipi) = {
> -       .name = "zynqmp-ipi",
> +       .name = "zynqmp_ipi",
>         .id = UCLASS_MAILBOX,
>         .of_match = zynqmp_ipi_ids,
>         .probe = zynqmp_ipi_probe,
> diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c
> index 6c1d64054c64..0615e5037809 100644
> --- a/drivers/mtd/nand/raw/arasan_nfc.c
> +++ b/drivers/mtd/nand/raw/arasan_nfc.c
> @@ -1306,7 +1306,7 @@ static const struct udevice_id arasan_nand_dt_ids[] = {
>  };
>
>  U_BOOT_DRIVER(arasan_nand) = {
> -       .name = "arasan-nand",
> +       .name = "arasan_nand",
>         .id = UCLASS_MTD,
>         .of_match = arasan_nand_dt_ids,
>         .probe = arasan_probe,
> diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
> index fa594552109d..92db2aa19c86 100644
> --- a/drivers/mtd/nand/raw/zynq_nand.c
> +++ b/drivers/mtd/nand/raw/zynq_nand.c
> @@ -1282,7 +1282,7 @@ static const struct udevice_id zynq_nand_dt_ids[] = {
>  };
>
>  U_BOOT_DRIVER(zynq_nand) = {
> -       .name = "zynq-nand",
> +       .name = "zynq_nand",
>         .id = UCLASS_MTD,
>         .of_match = zynq_nand_dt_ids,
>         .probe = zynq_nand_probe,
> --
> 2.28.0
>

Applied.
M

--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs