mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
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. -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEQp8+kY+LLUocC4bMphj1TA10mKEFAmCqVSUTHHRnbHhAbGlu dXRyb25peC5kZQAKCRCmGPVMDXSYoZYLD/9jdS5AF6o81I3098RLocyjWSCMOCHt agSjNGqNtbYEwCSrn9oEFLMiqxh5O5nJasO7TRXeTW5ESMX8QtI4ToRBo9PCey9c E34HMIH2w9tfJjpb/7M07OmGn7IjsOkRO7R9UPAjvLqpUmU5IJ0jBO2lCHpkpUwB OPiQQC+EjzCRYLL135hmio6PMbaveF6WUaBau5RD3lkJxzdiUSNDsDvIoKhppGnM WE9r0FkfAW48GYGIebqjwXCfK4ZQXN3a5IxIES03U/QlVOyaCaocALYyCsMB0Avk vmLu1plV+D3ux9LVPy7FOALjM6X7woI65vavSD5zyixRnQSCMF2A7tsx3AFUGxl/ mxu4h6pkSVHDvlSI5x9GSNM+vVHUMf6CPQne9a7Q7j0JKIQf/eYm4gZX9LsPf9h8 EFg7O5PHYZk/d6IGx4VBL8lD9a642LgJdmmbFDcbwDKNrBMjbcYGJOuvSXDivVCY 2AMZKK/sdOwjlip18yIUSS6u2F7JRVjwZADFKL8FQDQZnpXSgzZQUdRW1eFBkh18 +nqsA5yvn9hYpmMi29+HnLoo/CjVxVoU1X7lhiqlhoa7TdA8ucGTVfTVQatIzriE EsoiGAdMF68SEuxBf1i5hky7HI+2DDnChjWLU/o9nM/fr5mOgGs0MV53Dah+Aomw IPj1xBbm8VWgzg== =XjHi -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
f73d2a4293
@ -121,8 +121,13 @@ static int cplds_probe(struct platform_device *pdev)
|
||||
return fpga->irq;
|
||||
|
||||
base_irq = platform_get_irq(pdev, 1);
|
||||
if (base_irq < 0)
|
||||
if (base_irq < 0) {
|
||||
base_irq = 0;
|
||||
} else {
|
||||
ret = devm_irq_alloc_descs(&pdev->dev, base_irq, base_irq, CPLDS_NB_IRQ, 0);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
fpga->base = devm_ioremap_resource(&pdev->dev, res);
|
||||
|
@ -596,7 +596,7 @@ config IRQ_IDT3243X
|
||||
config APPLE_AIC
|
||||
bool "Apple Interrupt Controller (AIC)"
|
||||
depends on ARM64
|
||||
default ARCH_APPLE
|
||||
depends on ARCH_APPLE || COMPILE_TEST
|
||||
help
|
||||
Support for the Apple Interrupt Controller found on Apple Silicon SoCs,
|
||||
such as the M1.
|
||||
|
@ -359,10 +359,8 @@ static int mvebu_icu_probe(struct platform_device *pdev)
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
icu->base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(icu->base)) {
|
||||
dev_err(&pdev->dev, "Failed to map icu base address.\n");
|
||||
if (IS_ERR(icu->base))
|
||||
return PTR_ERR(icu->base);
|
||||
}
|
||||
|
||||
/*
|
||||
* Legacy bindings: ICU is one node with one MSI parent: force manually
|
||||
|
@ -384,10 +384,8 @@ static int mvebu_sei_probe(struct platform_device *pdev)
|
||||
|
||||
sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
sei->base = devm_ioremap_resource(sei->dev, sei->res);
|
||||
if (IS_ERR(sei->base)) {
|
||||
dev_err(sei->dev, "Failed to remap SEI resource\n");
|
||||
if (IS_ERR(sei->base))
|
||||
return PTR_ERR(sei->base);
|
||||
}
|
||||
|
||||
/* Retrieve the SEI capabilities with the interrupt ranges */
|
||||
sei->caps = of_device_get_match_data(&pdev->dev);
|
||||
|
@ -892,10 +892,8 @@ static int stm32_exti_probe(struct platform_device *pdev)
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
host_data->base = devm_ioremap_resource(dev, res);
|
||||
if (IS_ERR(host_data->base)) {
|
||||
dev_err(dev, "Unable to map registers\n");
|
||||
if (IS_ERR(host_data->base))
|
||||
return PTR_ERR(host_data->base);
|
||||
}
|
||||
|
||||
for (i = 0; i < drv_data->bank_nr; i++)
|
||||
stm32_exti_chip_init(host_data, i, np);
|
||||
|
Loading…
Reference in New Issue
Block a user