Commit 0fc080bc authored Jun 13, 2019 by Phil Reid Committed by Greg Kroah-Hartman Jul 21, 2019

pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order



[ Upstream commit 6dbc6e6f58556369bf999cd7d9793586f1b0e4b4 ]

Currently probing of the mcp23s08 results in an error message
"detected irqchip that is shared with multiple gpiochips:
please fix the driver"

This is due to the following:

Call to mcp23s08_irqchip_setup() with call hierarchy:
mcp23s08_irqchip_setup()
  gpiochip_irqchip_add_nested()
    gpiochip_irqchip_add_key()
      gpiochip_set_irq_hooks()

Call to devm_gpiochip_add_data() with call hierarchy:
devm_gpiochip_add_data()
  gpiochip_add_data_with_key()
    gpiochip_add_irqchip()
      gpiochip_set_irq_hooks()

The gpiochip_add_irqchip() returns immediately if there isn't a irqchip
but we added a irqchip due to the previous mcp23s08_irqchip_setup()
call. So it calls gpiochip_set_irq_hooks() a second time.

Fix this by moving the call to devm_gpiochip_add_data before
the call to mcp23s08_irqchip_setup

Fixes: 02e389e6 ("pinctrl: mcp23s08: fix irq setup order")
Suggested-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Phil Reid <preid@electromag.com.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 00640eb0

drivers/pinctrl/pinctrl-mcp23s08.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -889,6 +889,10 @@ static int mcp23s08_probe_one(struct mcp23s08 mcp, struct device dev,
		if (ret < 0)
		goto fail;

		ret = devm_gpiochip_add_data(dev, &mcp->chip, mcp);
		if (ret < 0)
		goto fail;

		mcp->irq_controller =
		device_property_read_bool(dev, "interrupt-controller");
		if (mcp->irq && mcp->irq_controller) {
		@@ -930,10 +934,6 @@ static int mcp23s08_probe_one(struct mcp23s08 mcp, struct device dev,
		goto fail;
		}

		ret = devm_gpiochip_add_data(dev, &mcp->chip, mcp);
		if (ret < 0)
		goto fail;

		if (one_regmap_config) {
		mcp->pinctrl_desc.name = devm_kasprintf(dev, GFP_KERNEL,
		"mcp23xxx-pinctrl.%d", raw_chip_address);