[PATCH 22/25] pinctrl: tegra: pinctrl-tegra194: Do not initialise field twice

From: Lee Jones
Date: Mon Jul 13 2020 - 10:50:26 EST


Both PIN_PINGROUP_ENTRY_Y() and DRV_PINGROUP_ENTRY_Y() macros are
called for each of the 2 pin groups defined here, and both of them
initialise 'drv_reg', causing the compiler to complain.

Only initialise 'drv_reg' once.

Fixes the following W=1 kernel build warning(s):

drivers/pinctrl/tegra/pinctrl-tegra194.c:71:14: warning: initialized field overwritten [-Woverride-init]
71 | .drv_reg = ((r)), | ^
drivers/pinctrl/tegra/pinctrl-tegra194.c:105:2: note: in expansion of macro âDRV_PINGROUP_ENTRY_Yâ
105 | DRV_PINGROUP_ENTRY_Y(0x14004, 12, 5, 20, 5, -1, -1, -1, -1, 0)
| ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:124:3: note: in expansion of macro âdrive_pex_l5_clkreq_n_pgg0â
124 | drive_##pg_name, | ^~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:128:2: note: in expansion of macro âPINGROUPâ
128 | PINGROUP(pex_l5_clkreq_n_pgg0, PE5, RSVD1, RSVD2, RSVD3, 0x14000, 0,
| ^~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:71:14: note: (near initialization for âtegra194_groups[0].drv_regâ)
71 | .drv_reg = ((r)), | ^
drivers/pinctrl/tegra/pinctrl-tegra194.c:105:2: note: in expansion of macro âDRV_PINGROUP_ENTRY_Yâ
105 | DRV_PINGROUP_ENTRY_Y(0x14004, 12, 5, 20, 5, -1, -1, -1, -1, 0)
| ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:124:3: note: in expansion of macro âdrive_pex_l5_clkreq_n_pgg0â
124 | drive_##pg_name, | ^~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:128:2: note: in expansion of macro âPINGROUPâ
128 | PINGROUP(pex_l5_clkreq_n_pgg0, PE5, RSVD1, RSVD2, RSVD3, 0x14000, 0,
| ^~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:71:14: warning: initialized field overwritten [-Woverride-init]
71 | .drv_reg = ((r)), | ^
drivers/pinctrl/tegra/pinctrl-tegra194.c:107:2: note: in expansion of macro âDRV_PINGROUP_ENTRY_Yâ
107 | DRV_PINGROUP_ENTRY_Y(0x1400c, 12, 5, 20, 5, -1, -1, -1, -1, 0)
| ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:124:3: note: in expansion of macro âdrive_pex_l5_rst_n_pgg1â
124 | drive_##pg_name, | ^~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:130:2: note: in expansion of macro âPINGROUPâ
130 | PINGROUP(pex_l5_rst_n_pgg1, PE5, RSVD1, RSVD2, RSVD3, 0x14008, 0,
| ^~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:71:14: note: (near initialization for âtegra194_groups[1].drv_regâ)
71 | .drv_reg = ((r)), | ^
drivers/pinctrl/tegra/pinctrl-tegra194.c:107:2: note: in expansion of macro âDRV_PINGROUP_ENTRY_Yâ
107 | DRV_PINGROUP_ENTRY_Y(0x1400c, 12, 5, 20, 5, -1, -1, -1, -1, 0)
| ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:124:3: note: in expansion of macro âdrive_pex_l5_rst_n_pgg1â
124 | drive_##pg_name, | ^~~~~~
drivers/pinctrl/tegra/pinctrl-tegra194.c:130:2: note: in expansion of macro âPINGROUPâ
130 | PINGROUP(pex_l5_rst_n_pgg1, PE5, RSVD1, RSVD2, RSVD3, 0x14008, 0,
| ^~~~~~~~

Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
Cc: Jonathan Hunter <jonathanh@xxxxxxxxxx>
Cc: linux-tegra@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/pinctrl/tegra/pinctrl-tegra194.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra194.c b/drivers/pinctrl/tegra/pinctrl-tegra194.c
index 2e0b5f7bb095b..c94ba17243c87 100644
--- a/drivers/pinctrl/tegra/pinctrl-tegra194.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra194.c
@@ -98,7 +98,6 @@ static struct tegra_function tegra194_functions[] = {
.sfsel_bit = 10, \
.schmitt_bit = schmitt_b, \
.drvtype_bit = 13, \
- .drv_reg = -1, \
.parked_bitmask = 0

#define drive_pex_l5_clkreq_n_pgg0 \
--
2.25.1