Skip to content

Commit 0256b6a

Browse files
committed
pinctrl: renesas: Annotate sentinels in tables
It does not make sense to have a comma after a sentinel, as any new elements must be added before the sentinel. Hence drop all such commas. Add comments to clarify the purpose of the empty elements. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/845f1d8285dd44522af1b0f429d4c6bd4759eb9e.1678272180.git.geert+renesas@glider.be
1 parent 3c24650 commit 0256b6a

36 files changed

Lines changed: 78 additions & 80 deletions

drivers/pinctrl/renesas/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static const struct of_device_id sh_pfc_of_table[] = {
645645
.data = &sh73a0_pinmux_info,
646646
},
647647
#endif
648-
{ },
648+
{ /* sentinel */ }
649649
};
650650
#endif
651651

@@ -1411,7 +1411,7 @@ static const struct platform_device_id sh_pfc_id_table[] = {
14111411
#ifdef CONFIG_PINCTRL_PFC_SHX3
14121412
{ "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info },
14131413
#endif
1414-
{ },
1414+
{ /* sentinel */ }
14151415
};
14161416

14171417
static struct platform_driver sh_pfc_driver = {

drivers/pinctrl/renesas/pfc-emev2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
16441644
FN_SEL_HSI_1_0_00, FN_SEL_HSI_1_0_01, 0, 0,
16451645
))
16461646
},
1647-
{ },
1647+
{ /* sentinel */ }
16481648
};
16491649

16501650
const struct sh_pfc_soc_info emev2_pinmux_info = {

drivers/pinctrl/renesas/pfc-r8a73a4.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
23842384
MSEL8CR_00_0, MSEL8CR_00_1,
23852385
))
23862386
},
2387-
{ },
2387+
{ /* sentinel */ }
23882388
};
23892389

23902390
static const struct pinmux_data_reg pinmux_data_regs[] = {
@@ -2510,7 +2510,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {
25102510
PORT323_DATA, PORT322_DATA, PORT321_DATA, PORT320_DATA,
25112511
))
25122512
},
2513-
{ },
2513+
{ /* sentinel */ }
25142514
};
25152515

25162516
static const struct pinmux_irq pinmux_irqs[] = {

drivers/pinctrl/renesas/pfc-r8a7740.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3348,7 +3348,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
33483348
MSEL5CR_0_0, MSEL5CR_0_1,
33493349
))
33503350
},
3351-
{ },
3351+
{ /* sentinel */ }
33523352
};
33533353

33543354
static const struct pinmux_data_reg pinmux_data_regs[] = {
@@ -3452,7 +3452,7 @@ static const struct pinmux_data_reg pinmux_data_regs[] = {
34523452
0, 0, 0, 0,
34533453
0, 0, 0, 0 ))
34543454
},
3455-
{ },
3455+
{ /* sentinel */ }
34563456
};
34573457

34583458
static const struct pinmux_irq pinmux_irqs[] = {

drivers/pinctrl/renesas/pfc-r8a77470.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3252,7 +3252,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
32523252
/* SEL_SSI0 [2] */
32533253
FN_SEL_SSI0_0, FN_SEL_SSI0_1, 0, 0, ))
32543254
},
3255-
{ },
3255+
{ /* sentinel */ }
32563256
};
32573257

32583258
static int r8a77470_pin_to_pocctrl(unsigned int pin, u32 *pocctrl)

drivers/pinctrl/renesas/pfc-r8a7778.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2832,7 +2832,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
28322832
FN_SEL_I2C1_A, FN_SEL_I2C1_B,
28332833
))
28342834
},
2835-
{ },
2835+
{ /* sentinel */ }
28362836
};
28372837

28382838
static const struct pinmux_bias_reg pinmux_bias_regs[] = {
@@ -3040,7 +3040,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {
30403040
[30] = SH_PFC_PIN_NONE,
30413041
[31] = SH_PFC_PIN_NONE,
30423042
} },
3043-
{ /* sentinel */ },
3043+
{ /* sentinel */ }
30443044
};
30453045

30463046
static const struct sh_pfc_soc_operations r8a7778_pfc_ops = {

drivers/pinctrl/renesas/pfc-r8a7779.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3919,7 +3919,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
39193919
/* SEL_I2C1 [2] */
39203920
FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, FN_SEL_I2C1_3 ))
39213921
},
3922-
{ },
3922+
{ /* sentinel */ }
39233923
};
39243924

39253925
const struct sh_pfc_soc_info r8a7779_pinmux_info = {

drivers/pinctrl/renesas/pfc-r8a7790.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5824,7 +5824,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
58245824
/* SEL_I2C1 [2] */
58255825
FN_SEL_I2C1_0, FN_SEL_I2C1_1, FN_SEL_I2C1_2, 0, ))
58265826
},
5827-
{ },
5827+
{ /* sentinel */ }
58285828
};
58295829

58305830
static int r8a7790_pin_to_pocctrl(unsigned int pin, u32 *pocctrl)

drivers/pinctrl/renesas/pfc-r8a7791.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6552,7 +6552,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
65526552
FN_SEL_SSP_0, FN_SEL_SSP_1, FN_SEL_SSP_2, 0,
65536553
/* RESERVED [6] */ ))
65546554
},
6555-
{ },
6555+
{ /* sentinel */ }
65566556
};
65576557

65586558
static int r8a7791_pin_to_pocctrl(unsigned int pin, u32 *pocctrl)
@@ -6874,7 +6874,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {
68746874
[30] = SH_PFC_PIN_NONE,
68756875
[31] = SH_PFC_PIN_NONE,
68766876
} },
6877-
{ /* sentinel */ },
6877+
{ /* sentinel */ }
68786878
};
68796879

68806880
static const struct sh_pfc_soc_operations r8a7791_pfc_ops = {

drivers/pinctrl/renesas/pfc-r8a7792.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2625,7 +2625,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
26252625
/* IP7_1_0 [2] */
26262626
FN_PWM0, FN_TCLK1, FN_FSO_CFE_0, 0 ))
26272627
},
2628-
{ },
2628+
{ /* sentinel */ }
26292629
};
26302630

26312631
static const struct pinmux_bias_reg pinmux_bias_regs[] = {

0 commit comments

Comments
 (0)