| Message ID | 1560399023-12638-1-git-send-email-preid@electromag.com.au |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/1] pinctlr: mcp23s08: Fix add_data and irqchip_add_nested call order | expand |
On Thu, Jun 13, 2019 at 6:10 AM Phil Reid <preid@electromag.com.au> wrote: > 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: 02e389e63 ("pinctrl: mcp23s08: fix irq setup order") > Suggested-by: Marco Felsch <m.felsch@pengutronix.de> > Signed-off-by: Phil Reid <preid@electromag.com.au> Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c index 5d7a851..b727de56 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08.c +++ b/drivers/pinctrl/pinctrl-mcp23s08.c @@ -881,6 +881,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) { @@ -922,10 +926,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);
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: 02e389e63 ("pinctrl: mcp23s08: fix irq setup order") Suggested-by: Marco Felsch <m.felsch@pengutronix.de> Signed-off-by: Phil Reid <preid@electromag.com.au> --- Notes: v3: - Add fixes tag v2: - remove unrelated whitespace changes drivers/pinctrl/pinctrl-mcp23s08.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)