Commit 1c2eb18e authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Linus Walleij
Browse files

pinctrl: nomadik: remove dead code after DB8540 pinctrl removal 



Commit b6d09f78 ("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: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20220919065435.27747-1-lukas.bulwahn@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 42da71ad

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+0 −6
Original line number Diff line number Diff line
@@ -1807,10 +1807,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,

	},

	{},

};
@@ -1861,8 +1857,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

drivers/pinctrl/nomadik/pinctrl-nomadik.h

+0 −14
Original line number Diff line number Diff line
@@ -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 */