Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'irq-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"A few fixes for irqchip drivers:
- Allocate interrupt descriptors correctly on Mainstone PXA when
SPARSE_IRQ is enabled; otherwise the interrupt association fails
- Make the APPLE AIC chip driver depend on APPLE
- Remove redundant error output on devm_ioremap_resource() failure"
* tag 'irq-urgent-2021-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: Remove redundant error printing
irqchip/apple-aic: APPLE_AIC should depend on ARCH_APPLE
ARM: PXA: Fix cplds irqdesc allocation when using legacy mode
+10
-11
+6
-1
arch/arm/mach-pxa/pxa_cplds_irqs.c
+6
-1
arch/arm/mach-pxa/pxa_cplds_irqs.c
···
121
121
return fpga->irq;
122
122
123
123
base_irq = platform_get_irq(pdev, 1);
124
-
if (base_irq < 0)
124
+
if (base_irq < 0) {
125
125
base_irq = 0;
126
+
} else {
127
+
ret = devm_irq_alloc_descs(&pdev->dev, base_irq, base_irq, CPLDS_NB_IRQ, 0);
128
+
if (ret < 0)
129
+
return ret;
130
+
}
126
131
127
132
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
128
133
fpga->base = devm_ioremap_resource(&pdev->dev, res);
+1
-1
drivers/irqchip/Kconfig
+1
-1
drivers/irqchip/Kconfig
+1
-3
drivers/irqchip/irq-mvebu-icu.c
+1
-3
drivers/irqchip/irq-mvebu-icu.c
···
359
359
360
360
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
361
361
icu->base = devm_ioremap_resource(&pdev->dev, res);
362
-
if (IS_ERR(icu->base)) {
363
-
dev_err(&pdev->dev, "Failed to map icu base address.\n");
362
+
if (IS_ERR(icu->base))
364
363
return PTR_ERR(icu->base);
365
-
}
366
364
367
365
/*
368
366
* Legacy bindings: ICU is one node with one MSI parent: force manually
+1
-3
drivers/irqchip/irq-mvebu-sei.c
+1
-3
drivers/irqchip/irq-mvebu-sei.c
···
384
384
385
385
sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
386
386
sei->base = devm_ioremap_resource(sei->dev, sei->res);
387
-
if (IS_ERR(sei->base)) {
388
-
dev_err(sei->dev, "Failed to remap SEI resource\n");
387
+
if (IS_ERR(sei->base))
389
388
return PTR_ERR(sei->base);
390
-
}
391
389
392
390
/* Retrieve the SEI capabilities with the interrupt ranges */
393
391
sei->caps = of_device_get_match_data(&pdev->dev);
+1
-3
drivers/irqchip/irq-stm32-exti.c
+1
-3
drivers/irqchip/irq-stm32-exti.c
···
892
892
893
893
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
894
894
host_data->base = devm_ioremap_resource(dev, res);
895
-
if (IS_ERR(host_data->base)) {
896
-
dev_err(dev, "Unable to map registers\n");
895
+
if (IS_ERR(host_data->base))
897
896
return PTR_ERR(host_data->base);
898
-
}
899
897
900
898
for (i = 0; i < drv_data->bank_nr; i++)
901
899
stm32_exti_chip_init(host_data, i, np);