| Message ID | a5a628d6-81d8-4933-81a8-64aad4743ec4@stanley.mountain (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | irqchip/riscv-aplic: Fix an IS_ERR() vs NULL bug in probe() | expand |
On 2024/8/20 16:42, Dan Carpenter wrote: > The devm_platform_ioremap_resource() function doesn't return NULL, it > returns error pointers. Fix the error handling to match. > > Fixes: 2333df5ae51e ("irqchip: Add RISC-V advanced PLIC driver for direct-mode") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/irqchip/irq-riscv-aplic-main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c > index 28dd175b5764..981fad6fb8f7 100644 > --- a/drivers/irqchip/irq-riscv-aplic-main.c > +++ b/drivers/irqchip/irq-riscv-aplic-main.c > @@ -175,9 +175,9 @@ static int aplic_probe(struct platform_device *pdev) > > /* Map the MMIO registers */ > regs = devm_platform_ioremap_resource(pdev, 0); > - if (!regs) { > + if (IS_ERR(regs)) { > dev_err(dev, "failed map MMIO registers\n"); > - return -ENOMEM; > + return PTR_ERR(regs); LGTM Reviewed-by: Jinjie Ruan <ruanjinjie@huawei.com> > } > > /*
On Tue, Aug 20, 2024 at 2:12 PM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The devm_platform_ioremap_resource() function doesn't return NULL, it > returns error pointers. Fix the error handling to match. > > Fixes: 2333df5ae51e ("irqchip: Add RISC-V advanced PLIC driver for direct-mode") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> LGTM. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup > --- > drivers/irqchip/irq-riscv-aplic-main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c > index 28dd175b5764..981fad6fb8f7 100644 > --- a/drivers/irqchip/irq-riscv-aplic-main.c > +++ b/drivers/irqchip/irq-riscv-aplic-main.c > @@ -175,9 +175,9 @@ static int aplic_probe(struct platform_device *pdev) > > /* Map the MMIO registers */ > regs = devm_platform_ioremap_resource(pdev, 0); > - if (!regs) { > + if (IS_ERR(regs)) { > dev_err(dev, "failed map MMIO registers\n"); > - return -ENOMEM; > + return PTR_ERR(regs); > } > > /* > -- > 2.43.0 >
diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-riscv-aplic-main.c index 28dd175b5764..981fad6fb8f7 100644 --- a/drivers/irqchip/irq-riscv-aplic-main.c +++ b/drivers/irqchip/irq-riscv-aplic-main.c @@ -175,9 +175,9 @@ static int aplic_probe(struct platform_device *pdev) /* Map the MMIO registers */ regs = devm_platform_ioremap_resource(pdev, 0); - if (!regs) { + if (IS_ERR(regs)) { dev_err(dev, "failed map MMIO registers\n"); - return -ENOMEM; + return PTR_ERR(regs); } /*
The devm_platform_ioremap_resource() function doesn't return NULL, it returns error pointers. Fix the error handling to match. Fixes: 2333df5ae51e ("irqchip: Add RISC-V advanced PLIC driver for direct-mode") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/irqchip/irq-riscv-aplic-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)