There's no good reason for the sh_cmt_of_table[] initializer to
violate the 80-column limit, especially after the commit 8d50e9476bb4
("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated")
partially fixed it -- fix the R-Car gen2 related entries as well.

Signed-off-by: Sergei Shtylyov <[email protected]>
Reviewed-by: Chris Paterson <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>

---
Changes in version 2:
- refreshed the patch;
- added Chris' and Geert's tags.

 drivers/clocksource/sh_cmt.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: tip/drivers/clocksource/sh_cmt.c
===================================================================
--- tip.orig/drivers/clocksource/sh_cmt.c
+++ tip/drivers/clocksource/sh_cmt.c
@@ -935,8 +935,14 @@ static const struct of_device_id sh_cmt_
                .compatible = "renesas,cmt-48-gen2",
                .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
        },
-       { .compatible = "renesas,rcar-gen2-cmt0", .data = 
&sh_cmt_info[SH_CMT0_RCAR_GEN2] },
-       { .compatible = "renesas,rcar-gen2-cmt1", .data = 
&sh_cmt_info[SH_CMT1_RCAR_GEN2] },
+       {
+               .compatible = "renesas,rcar-gen2-cmt0",
+               .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
+       },
+       {
+               .compatible = "renesas,rcar-gen2-cmt1",
+               .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2]
+       },
        { }
 };
 MODULE_DEVICE_TABLE(of, sh_cmt_of_table);

Reply via email to