Commit 50787be3 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: pcf857x: Use irqchip template 



This makes the driver use the irqchip template to assign
properties to the gpio_irq_chip instead of using the
explicit calls to gpiochip_irqchip_add_nested() and
gpiochip_set_nested_irqchip(). The irqchip is instead
added while adding the gpiochip.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Anders Darander <anders@chargestorm.se>
Cc: Roger Quadros <rogerq@ti.com>
Link: https://lore.kernel.org/r/20200717144835.68150-1-linus.walleij@linaro.org
parent dfc3a26d

drivers/gpio/gpio-pcf857x.c

+24 −23
Original line number Diff line number Diff line
@@ -334,29 +334,19 @@ static int pcf857x_probe(struct i2c_client *client, 
	gpio->out = ~n_latch;

	gpio->status = gpio->out;



	status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);

	if (status < 0)

		goto fail;



	/* Enable irqchip if we have an interrupt */

	if (client->irq) {

		gpio->irqchip.name = "pcf857x",

		gpio->irqchip.irq_enable = pcf857x_irq_enable,

		gpio->irqchip.irq_disable = pcf857x_irq_disable,

		gpio->irqchip.irq_ack = noop,

		gpio->irqchip.irq_mask = noop,

		gpio->irqchip.irq_unmask = noop,

		gpio->irqchip.irq_set_wake = pcf857x_irq_set_wake,

		gpio->irqchip.irq_bus_lock = pcf857x_irq_bus_lock,

		gpio->irqchip.irq_bus_sync_unlock = pcf857x_irq_bus_sync_unlock,

		status = gpiochip_irqchip_add_nested(&gpio->chip,

						     &gpio->irqchip,

						     0, handle_level_irq,

						     IRQ_TYPE_NONE);

		if (status) {

			dev_err(&client->dev, "cannot add irqchip\n");

			goto fail;

		}

		struct gpio_irq_chip *girq;



		gpio->irqchip.name = "pcf857x";

		gpio->irqchip.irq_enable = pcf857x_irq_enable;

		gpio->irqchip.irq_disable = pcf857x_irq_disable;

		gpio->irqchip.irq_ack = noop;

		gpio->irqchip.irq_mask = noop;

		gpio->irqchip.irq_unmask = noop;

		gpio->irqchip.irq_set_wake = pcf857x_irq_set_wake;

		gpio->irqchip.irq_bus_lock = pcf857x_irq_bus_lock;

		gpio->irqchip.irq_bus_sync_unlock = pcf857x_irq_bus_sync_unlock;



		status = devm_request_threaded_irq(&client->dev, client->irq,

					NULL, pcf857x_irq, IRQF_ONESHOT |
@@ -365,10 +355,21 @@ static int pcf857x_probe(struct i2c_client *client, 
		if (status)

			goto fail;



		gpiochip_set_nested_irqchip(&gpio->chip, &gpio->irqchip,

					    client->irq);

		girq = &gpio->chip.irq;

		girq->chip = &gpio->irqchip;

		/* This will let us handle the parent IRQ in the driver */

		girq->parent_handler = NULL;

		girq->num_parents = 0;

		girq->parents = NULL;

		girq->default_type = IRQ_TYPE_NONE;

		girq->handler = handle_level_irq;

		girq->threaded = true;

	}



	status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);

	if (status < 0)

		goto fail;



	/* Let platform code set up the GPIOs and their users.

	 * Now is the first time anyone could use them.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE