Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: hide PCONFDUMP in #ifdef

Browse Source 
The zynq and qcom-spmi pinctrl drivers both use pin_config_item arrays
to provide extra interfaces in debugfs. This structure and the
PCONFDUMP macro are not defined if CONFIG_DEBUG_FS is turned off,
so we get build errors like:

pinctrl/qcom/pinctrl-spmi-gpio.c:139:37: error: array type has incomplete element type
 static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = {
                                     ^
pinctrl/qcom/pinctrl-spmi-gpio.c:140:2: error: implicit declaration of function 'PCONFDUMP' [-Werror=implicit-function-declaration]
  PCONFDUMP(PMIC_GPIO_CONF_PULL_UP,  "pull up strength", NULL, true),
  ^
pinctrl/qcom/pinctrl-spmi-gpio.c:139:37: warning: 'pmic_conf_items' defined but not used [-Wunused-variable]
 static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = {

Lacking any better idea to solve this nicely, this patch uses #ifdef
to hide the structures, just like the pinctrl core does.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Arnd Bergmann 2015-01-28 17:08:44 +01:00 committed by Linus Walleij
parent 5ae0c7ad06
commit 4f06266a62
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/pinctrl-zynq.c
View File

@ -924,9 +924,11 @@ static const struct pinconf_generic_params zynq_dt_params[] = {
{"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18}, {"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
}; };
#ifdef CONFIG_DEBUG_FS
static const struct pin_config_item zynq_conf_items[ARRAY_SIZE(zynq_dt_params)] = { static const struct pin_config_item zynq_conf_items[ARRAY_SIZE(zynq_dt_params)] = {
PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true), PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true),
}; };
#endif
static unsigned int zynq_pinconf_iostd_get(u32 reg) static unsigned int zynq_pinconf_iostd_get(u32 reg)
{ {
@ -1101,7 +1103,9 @@ static struct pinctrl_desc zynq_desc = {
.confops = &zynq_pinconf_ops, .confops = &zynq_pinconf_ops,
.num_custom_params = ARRAY_SIZE(zynq_dt_params), .num_custom_params = ARRAY_SIZE(zynq_dt_params),
.custom_params = zynq_dt_params, .custom_params = zynq_dt_params,
#ifdef CONFIG_DEBUG_FS
.custom_conf_items = zynq_conf_items, .custom_conf_items = zynq_conf_items,
#endif
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };

4
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
View File

@ -136,10 +136,12 @@ static const struct pinconf_generic_params pmic_gpio_bindings[] = {
{"qcom,drive-strength", PMIC_GPIO_CONF_STRENGTH, 0}, {"qcom,drive-strength", PMIC_GPIO_CONF_STRENGTH, 0},
}; };
#ifdef CONFIG_DEBUG_FS
static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = { static const struct pin_config_item pmic_conf_items[ARRAY_SIZE(pmic_gpio_bindings)] = {
PCONFDUMP(PMIC_GPIO_CONF_PULL_UP, "pull up strength", NULL, true), PCONFDUMP(PMIC_GPIO_CONF_PULL_UP, "pull up strength", NULL, true),
PCONFDUMP(PMIC_GPIO_CONF_STRENGTH, "drive-strength", NULL, true), PCONFDUMP(PMIC_GPIO_CONF_STRENGTH, "drive-strength", NULL, true),
}; };
#endif
static const char *const pmic_gpio_groups[] = { static const char *const pmic_gpio_groups[] = {
"gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio8", "gpio1", "gpio2", "gpio3", "gpio4", "gpio5", "gpio6", "gpio7", "gpio8",
@ -744,7 +746,9 @@ static int pmic_gpio_probe(struct platform_device *pdev)
pctrldesc->npins = npins; pctrldesc->npins = npins;
pctrldesc->num_custom_params = ARRAY_SIZE(pmic_gpio_bindings); pctrldesc->num_custom_params = ARRAY_SIZE(pmic_gpio_bindings);
pctrldesc->custom_params = pmic_gpio_bindings; pctrldesc->custom_params = pmic_gpio_bindings;
#ifdef CONFIG_DEBUG_FS
pctrldesc->custom_conf_items = pmic_conf_items; pctrldesc->custom_conf_items = pmic_conf_items;
#endif
for (i = 0; i < npins; i++, pindesc++) { for (i = 0; i < npins; i++, pindesc++) {
pad = &pads[i]; pad = &pads[i];