[PATCH] gpio: sx150x: Fix compile issue when CONFIG_OF_GPIO is not defined

From: Murilo Opsfelder Araujo
Date: Thu Jan 22 2015 - 19:37:40 EST


Without this patch, the compilation of gpio-sx150x.c fails because
struct gpio_chip members 'of_node' and 'of_gpio_n_cells' do not exist
when CONFIG_OF_GPIO is not defined:

drivers/gpio/gpio-sx150x.c: In function âsx150x_init_chipâ:
drivers/gpio/gpio-sx150x.c:487:17: error: âstruct gpio_chipâ has no member named âof_nodeâ
chip->gpio_chip.of_node = client->dev.of_node;
^
drivers/gpio/gpio-sx150x.c:488:17: error: âstruct gpio_chipâ has no member named âof_gpio_n_cellsâ
chip->gpio_chip.of_gpio_n_cells = 2;
^

This issue was introduced by the commit
04d2264c3bf07f5c3d18165ba78de0a93360c6c0 "gpio: sx150x: add dts support for sx150x driver".

Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@xxxxxxxxx>
---
drivers/gpio/gpio-sx150x.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index 88012e2..b1e2f1c 100644
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -484,8 +484,10 @@ static void sx150x_init_chip(struct sx150x_chip *chip,
chip->gpio_chip.base = pdata->gpio_base;
chip->gpio_chip.can_sleep = true;
chip->gpio_chip.ngpio = chip->dev_cfg->ngpios;
+#ifdef CONFIG_OF_GPIO
chip->gpio_chip.of_node = client->dev.of_node;
chip->gpio_chip.of_gpio_n_cells = 2;
+#endif
if (pdata->oscio_is_gpo)
++chip->gpio_chip.ngpio;

--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/