aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-12-12 11:22:11 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-12-12 11:22:11 +0100
commit170680abd1eb98a9773ed068435fef9a6402a10f (patch)
treeea9cea0e4e1a6e2b4cbc6ee85a25aaeeea0f6814 /drivers
parentgpio: pl061: document gpio-ranges property for bindings file (diff)
downloadlinux-dev-170680abd1eb98a9773ed068435fef9a6402a10f.tar.xz
linux-dev-170680abd1eb98a9773ed068435fef9a6402a10f.zip
gpio: mcp23s08: fix up compilation error
The driver depends on the chip.of_node being present to compile, which is the case on some target platforms but not others. Instead, rely on chip.dev->of_node to be used, as struct device always has an of_node in place. Cc: Alexander Stein <alexander.stein@systec-electronic.com> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-mcp23s08.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 93ee7da2d8b0..da9c316059bc 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -655,8 +655,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
mcp->irq_controller = pdata->irq_controller;
if (mcp->irq && mcp->irq_controller) {
- mcp->irq_active_high = of_property_read_bool(mcp->chip.of_node,
- "microchip,irq-active-high");
+ mcp->irq_active_high =
+ of_property_read_bool(mcp->chip.dev->of_node,
+ "microchip,irq-active-high");
if (type == MCP_TYPE_017)
mirror = pdata->mirror;