lkml.org 
[lkml]   [2023]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 06/17] gpio: cadence: Convert to immutable irq_chip
    Convert the driver to immutable irq-chip with a bit of
    intuition.

    Cc: Marc Zyngier <maz@kernel.org>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    ---
    drivers/gpio/gpio-cadence.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpio/gpio-cadence.c b/drivers/gpio/gpio-cadence.c
    index 137aea49ba02..3720b90cad10 100644
    --- a/drivers/gpio/gpio-cadence.c
    +++ b/drivers/gpio/gpio-cadence.c
    @@ -70,6 +70,7 @@ static void cdns_gpio_irq_mask(struct irq_data *d)
    struct cdns_gpio_chip *cgpio = gpiochip_get_data(chip);

    iowrite32(BIT(d->hwirq), cgpio->regs + CDNS_GPIO_IRQ_DIS);
    + gpiochip_disable_irq(chip, irqd_to_hwirq(d));
    }

    static void cdns_gpio_irq_unmask(struct irq_data *d)
    @@ -77,6 +78,7 @@ static void cdns_gpio_irq_unmask(struct irq_data *d)
    struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
    struct cdns_gpio_chip *cgpio = gpiochip_get_data(chip);

    + gpiochip_enable_irq(chip, irqd_to_hwirq(d));
    iowrite32(BIT(d->hwirq), cgpio->regs + CDNS_GPIO_IRQ_EN);
    }

    @@ -138,11 +140,13 @@ static void cdns_gpio_irq_handler(struct irq_desc *desc)
    chained_irq_exit(irqchip, desc);
    }

    -static struct irq_chip cdns_gpio_irqchip = {
    +static const struct irq_chip cdns_gpio_irqchip = {
    .name = "cdns-gpio",
    .irq_mask = cdns_gpio_irq_mask,
    .irq_unmask = cdns_gpio_irq_unmask,
    - .irq_set_type = cdns_gpio_irq_set_type
    + .irq_set_type = cdns_gpio_irq_set_type,
    + .flags = IRQCHIP_IMMUTABLE,
    + GPIOCHIP_IRQ_RESOURCE_HELPERS,
    };

    static int cdns_gpio_probe(struct platform_device *pdev)
    @@ -222,7 +226,7 @@ static int cdns_gpio_probe(struct platform_device *pdev)
    struct gpio_irq_chip *girq;

    girq = &cgpio->gc.irq;
    - girq->chip = &cdns_gpio_irqchip;
    + gpio_irq_chip_set_chip(girq, &cdns_gpio_irqchip);
    girq->parent_handler = cdns_gpio_irq_handler;
    girq->num_parents = 1;
    girq->parents = devm_kcalloc(&pdev->dev, 1,
    --
    2.34.1

    \
     
     \ /
      Last update: 2023-03-27 00:25    [W:4.330 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site