• Arnd Bergmann's avatar
    pinctrl: tegra194: remove duplicate initializer again · 293083f8
    Arnd Bergmann authored
    An earlier bugfix removed a duplicate field initializer in
    a macro, but it seems that this came back with the following
    update:
    
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1341:28: error: initialized field overwritten [-Werror=override-init]
     1341 |                 .drv_reg = ((r)),                               \
          |                            ^
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1392:41: note: in expansion of macro 'DRV_PINGROUP_ENTRY_Y'
     1392 | #define drive_touch_clk_pcc4            DRV_PINGROUP_ENTRY_Y(0x2004,    12,     5,      20,     5,      -1,     -1,     -1,     -1,     1)
          |                                         ^~~~~~~~~~~~~~~~~~~~
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1631:17: note: in expansion of macro 'drive_touch_clk_pcc4'
     1631 |                 drive_##pg_name,                                \
          |                 ^~~~~~
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1636:9: note: in expansion of macro 'PINGROUP'
     1636 |         PINGROUP(touch_clk_pcc4,        GP,             TOUCH,          RSVD2,          RSVD3,          0x2000,         1,      Y,      -1,     -1,     6,      8,      -1,     10,     11,     12,     N,      -1,     -1,     N,      "vddio_ao"),
          |         ^~~~~~~~
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1341:28: note: (near initialization for 'tegra194_groups[0].drv_reg')
     1341 |                 .drv_reg = ((r)),                               \
          |                            ^
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1392:41: note: in expansion of macro 'DRV_PINGROUP_ENTRY_Y'
     1392 | #define drive_touch_clk_pcc4            DRV_PINGROUP_ENTRY_Y(0x2004,    12,     5,      20,     5,      -1,     -1,     -1,     -1,     1)
          |                                         ^~~~~~~~~~~~~~~~~~~~
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1631:17: note: in expansion of macro 'drive_touch_clk_pcc4'
     1631 |                 drive_##pg_name,                                \
          |                 ^~~~~~
    drivers/pinctrl/tegra/pinctrl-tegra194.c:1636:9: note: in expansion of macro 'PINGROUP'
     1636 |         PINGROUP(touch_clk_pcc4,        GP,             TOUCH,          RSVD2,          RSVD3,          0x2000,         1,      Y,      -1,     -1,     6,      8,      -1,     10,     11,     12,     N,      -1,     -1,     N,      "vddio_ao"),
          |         ^~~~~~~~
    
    Remove it again.
    
    Fixes: 613c0826 ("pinctrl: tegra: Add pinmux support for Tegra194")
    Fixes: 92cadf68 ("pinctrl: tegra: pinctrl-tegra194: Do not initialise field twice")
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    Link: https://lore.kernel.org/r/20211104133645.1186968-1-arnd@kernel.orgSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
    293083f8
pinctrl-tegra194.c 92.8 KB