2022-09-19 07:24:29

by Lukas Bulwahn

Subject: [PATCH] pinctrl: nomadik: remove dead code after DB8540 pinctrl removal

Commit b6d09f780761 ("pinctrl: nomadik: Drop U8540/9540 support") removes
the DB8540 pin controller driver and its config PINCTRL_DB8540.

There is some code left-over in the generic nomadik pinctrl driver, i.e.,
drivers/pinctrl/nomadik/pinctrl-nomadik.{ch}, that is still around for the
removed DB8540 pin controller driver.

Remove this remaining dead code.

This issue was discovered with ./scripts/checkkconfigsymbols.py.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
drivers/pinctrl/nomadik/pinctrl-nomadik.c | 6 ------
drivers/pinctrl/nomadik/pinctrl-nomadik.h | 14 --------------
2 files changed, 20 deletions(-)

diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 58c7ac8c7d4d..8fdffbb925aa 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -1802,10 +1802,6 @@ static const struct of_device_id nmk_pinctrl_match[] = {
.compatible = "stericsson,db8500-pinctrl",
.data = (void *)PINCTRL_NMK_DB8500,
},
- {
- .compatible = "stericsson,db8540-pinctrl",
- .data = (void *)PINCTRL_NMK_DB8540,
- },
{},
};

@@ -1856,8 +1852,6 @@ static int nmk_pinctrl_probe(struct platform_device *pdev)
nmk_pinctrl_stn8815_init(&npct->soc);
if (version == PINCTRL_NMK_DB8500)
nmk_pinctrl_db8500_init(&npct->soc);
- if (version == PINCTRL_NMK_DB8540)
- nmk_pinctrl_db8540_init(&npct->soc);

/*
* Since we depend on the GPIO chips to provide clock and register base
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.h b/drivers/pinctrl/nomadik/pinctrl-nomadik.h
index 820f07f4db32..84e297757335 100644
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.h
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.h
@@ -5,7 +5,6 @@
/* Package definitions */
#define PINCTRL_NMK_STN8815 0
#define PINCTRL_NMK_DB8500 1
-#define PINCTRL_NMK_DB8540 2

/* Alternate functions: function C is set in hw by setting both A and B */
#define NMK_GPIO_ALT_GPIO 0
@@ -173,17 +172,4 @@ nmk_pinctrl_db8500_init(const struct nmk_pinctrl_soc_data **soc)

#endif

-#ifdef CONFIG_PINCTRL_DB8540
-
-void nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc);
-
-#else
-
-static inline void
-nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)
-{
-}
-
-#endif
-
#endif /* PINCTRL_PINCTRL_NOMADIK_H */
--
2.17.1

2022-09-19 07:52:05

by Linus Walleij

Subject: Re: [PATCH] pinctrl: nomadik: remove dead code after DB8540 pinctrl removal

On Mon, Sep 19, 2022 at 8:55 AM Lukas Bulwahn <[email protected]> wrote:

> Commit b6d09f780761 ("pinctrl: nomadik: Drop U8540/9540 support") removes
> the DB8540 pin controller driver and its config PINCTRL_DB8540.
>
> There is some code left-over in the generic nomadik pinctrl driver, i.e.,
> drivers/pinctrl/nomadik/pinctrl-nomadik.{ch}, that is still around for the
> removed DB8540 pin controller driver.
>
> Remove this remaining dead code.
>
> This issue was discovered with ./scripts/checkkconfigsymbols.py.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>

Nice cleanup, patch applied!

Yours,
Linus Walleij