Skip to content

Commit 48a68a4

Browse files
committed
Merge tag 'renesas-arm-soc-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc
Renesas ARM SoC updates for v5.19 - Drop commas after sentinels. * tag 'renesas-arm-soc-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: shmobile: rcar-gen2: Drop comma after OF match table sentinel ARM: shmobile: Drop commas after dt_compat sentinels Link: https://lore.kernel.org/r/cover.1651828611.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents ff9fb2e + 7bc53f5 commit 48a68a4

10 files changed

Lines changed: 11 additions & 11 deletions

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static const struct of_device_id rcar_gen2_quirk_match[] = {
6767
{ .compatible = "dlg,da9063", .data = &da9063_msg },
6868
{ .compatible = "dlg,da9063l", .data = &da9063_msg },
6969
{ .compatible = "dlg,da9210", .data = &da9210_msg },
70-
{},
70+
{ /* sentinel */ }
7171
};
7272

7373
static int regulator_quirk_notify(struct notifier_block *nb,

arch/arm/mach-shmobile/setup-emev2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
static const char *const emev2_boards_compat_dt[] __initconst = {
1818
"renesas,emev2",
19-
NULL,
19+
NULL
2020
};
2121

2222
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r7s72100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
static const char *const r7s72100_boards_compat_dt[] __initconst = {
1616
"renesas,r7s72100",
17-
NULL,
17+
NULL
1818
};
1919

2020
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r7s9210.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
static const char *const r7s9210_boards_compat_dt[] __initconst = {
1717
"renesas,r7s9210",
18-
NULL,
18+
NULL
1919
};
2020

2121
DT_MACHINE_START(R7S72100_DT, "Generic R7S9210 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r8a73a4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
static const char *const r8a73a4_boards_compat_dt[] __initconst = {
1616
"renesas,r8a73a4",
17-
NULL,
17+
NULL
1818
};
1919

2020
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r8a7740.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static void __init r8a7740_generic_init(void)
7272

7373
static const char *const r8a7740_boards_compat_dt[] __initconst = {
7474
"renesas,r8a7740",
75-
NULL,
75+
NULL
7676
};
7777

7878
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r8a7778.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void __init r8a7778_init_irq_dt(void)
4343

4444
static const char *const r8a7778_compat_dt[] __initconst = {
4545
"renesas,r8a7778",
46-
NULL,
46+
NULL
4747
};
4848

4949
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-r8a7779.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void __init r8a7779_init_irq_dt(void)
4949

5050
static const char *const r8a7779_compat_dt[] __initconst = {
5151
"renesas,r8a7779",
52-
NULL,
52+
NULL
5353
};
5454

5555
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-rcar-gen2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static const char * const rcar_gen2_boards_compat_dt[] __initconst = {
199199
"renesas,r8a7792",
200200
"renesas,r8a7793",
201201
"renesas,r8a7794",
202-
NULL,
202+
NULL
203203
};
204204

205205
DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")
@@ -215,7 +215,7 @@ static const char * const rz_g1_boards_compat_dt[] __initconst = {
215215
"renesas,r8a7744",
216216
"renesas,r8a7745",
217217
"renesas,r8a77470",
218-
NULL,
218+
NULL
219219
};
220220

221221
DT_MACHINE_START(RZ_G1_DT, "Generic RZ/G1 (Flattened Device Tree)")

arch/arm/mach-shmobile/setup-sh73a0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static void __init sh73a0_generic_init(void)
3232

3333
static const char *const sh73a0_boards_compat_dt[] __initconst = {
3434
"renesas,sh73a0",
35-
NULL,
35+
NULL
3636
};
3737

3838
DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")

0 commit comments

Comments
 (0)