Commit 945e72db authored by Linus Walleij's avatar Linus Walleij Committed by Andy Shevchenko
Browse files

gpio: crystalcove: 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.

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 3abbdbe3

drivers/gpio/gpio-crystalcove.c

+15 −9
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) 
	int retval;

	struct device *dev = pdev->dev.parent;

	struct intel_soc_pmic *pmic = dev_get_drvdata(dev);

	struct gpio_irq_chip *girq;



	if (irq < 0)

		return irq;
@@ -353,14 +354,15 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) 
	cg->chip.dbg_show = crystalcove_gpio_dbg_show;

	cg->regmap = pmic->regmap;



	retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg);

	if (retval) {

		dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval);

		return retval;

	}



	gpiochip_irqchip_add_nested(&cg->chip, &crystalcove_irqchip, 0,

				    handle_simple_irq, IRQ_TYPE_NONE);

	girq = &cg->chip.irq;

	girq->chip = &crystalcove_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_simple_irq;

	girq->threaded = true;



	retval = request_threaded_irq(irq, NULL, crystalcove_gpio_irq_handler,

				      IRQF_ONESHOT, KBUILD_MODNAME, cg);
@@ -370,7 +372,11 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) 
		return retval;

	}



	gpiochip_set_nested_irqchip(&cg->chip, &crystalcove_irqchip, irq);

	retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg);

	if (retval) {

		dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval);

		return retval;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE