Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de30346d authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Greg Kroah-Hartman
Browse files

gpio: tqmx86: really make IRQ optional 



[ Upstream commit 9b87f43537acfa24b95c236beba0f45901356eb2 ]

The tqmx86 MFD driver was passing IRQ 0 for "no IRQ" in the past. This
causes warnings with newer kernels.

Prepare the gpio-tqmx86 driver for the fixed MFD driver by handling a
missing IRQ properly.

Fixes: b868db94 ("gpio: tqmx86: Add GPIO from for this IO controller")
Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9d440b5c

drivers/gpio/gpio-tqmx86.c

+3 −3
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret, irq;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

	irq = platform_get_irq_optional(pdev, 0);

	if (irq < 0 && irq != -ENXIO)

		return irq;



	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -275,7 +275,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	if (irq) {

	if (irq > 0) {

		struct irq_chip *irq_chip = &gpio->irq_chip;

		u8 irq_status;