diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-03-14 18:52:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-14 18:53:00 +0100 |
| commit | 411472ae5bb4ffe1404dc5f1505f07e0f04770a8 (patch) | |
| tree | 0ea009eb6011c7f093ba26d9af054a639ef4d401 /drivers/pinctrl/pinctrl-starfive.c | |
| parent | f0fae8a0edd445d042ee94153f127e8939fcf3d3 (diff) | |
| parent | 09688c0166e76ce2fb85e86b9d99be8b0084cdf9 (diff) | |
| download | linux-411472ae5bb4ffe1404dc5f1505f07e0f04770a8.tar.bz2 | |
Merge tag 'v5.17-rc8' into irq/core, to fix conflicts
Conflicts:
drivers/pinctrl/pinctrl-starfive.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-starfive.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-starfive.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-starfive.c b/drivers/pinctrl/pinctrl-starfive.c index 5be9866c2b3c..ab4b2ee9f217 100644 --- a/drivers/pinctrl/pinctrl-starfive.c +++ b/drivers/pinctrl/pinctrl-starfive.c @@ -1164,6 +1164,7 @@ static int starfive_irq_set_type(struct irq_data *d, unsigned int trigger) } static struct irq_chip starfive_irq_chip = { + .name = "StarFive GPIO", .irq_ack = starfive_irq_ack, .irq_mask = starfive_irq_mask, .irq_mask_ack = starfive_irq_mask_ack, @@ -1307,8 +1308,6 @@ static int starfive_probe(struct platform_device *pdev) sfp->gc.base = -1; sfp->gc.ngpio = NR_GPIOS; - starfive_irq_chip.name = sfp->gc.label; - sfp->gc.irq.chip = &starfive_irq_chip; sfp->gc.irq.parent_handler = starfive_gpio_irq_handler; sfp->gc.irq.num_parents = 1; |