Skip to content

Commit 1c2eb18

Browse files
bulwahnlinusw
authored andcommitted
pinctrl: nomadik: remove dead code after DB8540 pinctrl removal
Commit b6d09f7 ("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]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 42da71a commit 1c2eb18

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

drivers/pinctrl/nomadik/pinctrl-nomadik.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,10 +1807,6 @@ static const struct of_device_id nmk_pinctrl_match[] = {
18071807
.compatible = "stericsson,db8500-pinctrl",
18081808
.data = (void *)PINCTRL_NMK_DB8500,
18091809
},
1810-
{
1811-
.compatible = "stericsson,db8540-pinctrl",
1812-
.data = (void *)PINCTRL_NMK_DB8540,
1813-
},
18141810
{},
18151811
};
18161812

@@ -1861,8 +1857,6 @@ static int nmk_pinctrl_probe(struct platform_device *pdev)
18611857
nmk_pinctrl_stn8815_init(&npct->soc);
18621858
if (version == PINCTRL_NMK_DB8500)
18631859
nmk_pinctrl_db8500_init(&npct->soc);
1864-
if (version == PINCTRL_NMK_DB8540)
1865-
nmk_pinctrl_db8540_init(&npct->soc);
18661860

18671861
/*
18681862
* Since we depend on the GPIO chips to provide clock and register base

drivers/pinctrl/nomadik/pinctrl-nomadik.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/* Package definitions */
66
#define PINCTRL_NMK_STN8815 0
77
#define PINCTRL_NMK_DB8500 1
8-
#define PINCTRL_NMK_DB8540 2
98

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

174173
#endif
175174

176-
#ifdef CONFIG_PINCTRL_DB8540
177-
178-
void nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc);
179-
180-
#else
181-
182-
static inline void
183-
nmk_pinctrl_db8540_init(const struct nmk_pinctrl_soc_data **soc)
184-
{
185-
}
186-
187-
#endif
188-
189175
#endif /* PINCTRL_PINCTRL_NOMADIK_H */

0 commit comments

Comments
 (0)