| Message ID | 1415031356-11664-1-git-send-email-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6bdf891a17148a1b91beb603b09c599dc98eb4fb |
| Headers | show |
On Mon, Nov 3, 2014 at 2:15 PM, Lee Jones <lee.jones@linaro.org> wrote: > /* Clean up the mailbox interrupts after pre-kernel code. */ > @@ -3179,15 +3179,14 @@ static int db8500_prcmu_probe(struct platform_device *pdev) > irq = platform_get_irq(pdev, 0); > if (irq <= 0) { Shouldn't this be if (irq < 0) then? > dev_err(&pdev->dev, "no prcmu irq provided\n"); > - return -ENOENT; > + return irq; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Mon, 03 Nov 2014, Fabio Estevam wrote: > On Mon, Nov 3, 2014 at 2:15 PM, Lee Jones <lee.jones@linaro.org> wrote: > > > /* Clean up the mailbox interrupts after pre-kernel code. */ > > @@ -3179,15 +3179,14 @@ static int db8500_prcmu_probe(struct platform_device *pdev) > > irq = platform_get_irq(pdev, 0); > > if (irq <= 0) { > > Shouldn't this be if (irq < 0) then? Perhaps Linus can answer that. Linus, Is 0 a valid IRQ on the u8500 platform or not? > > dev_err(&pdev->dev, "no prcmu irq provided\n"); > > - return -ENOENT; > > + return irq;
On Mon, Nov 3, 2014 at 5:50 PM, Lee Jones <lee.jones@linaro.org> wrote: > On Mon, 03 Nov 2014, Fabio Estevam wrote: > >> On Mon, Nov 3, 2014 at 2:15 PM, Lee Jones <lee.jones@linaro.org> wrote: >> >> > /* Clean up the mailbox interrupts after pre-kernel code. */ >> > @@ -3179,15 +3179,14 @@ static int db8500_prcmu_probe(struct platform_device *pdev) >> > irq = platform_get_irq(pdev, 0); >> > if (irq <= 0) { >> >> Shouldn't this be if (irq < 0) then? > > Perhaps Linus can answer that. > > Linus, > > Is 0 a valid IRQ on the u8500 platform or not? It is not. 0 is NO_IRQ and should be so for every system... just the lazy and ancient ones lag behind. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 89ae8bf..a820473 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -3150,27 +3150,27 @@ static int db8500_prcmu_probe(struct platform_device *pdev) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu"); if (!res) { dev_err(&pdev->dev, "no prcmu memory region provided\n"); - return -ENOENT; + return -EINVAL; } prcmu_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (!prcmu_base) { dev_err(&pdev->dev, "failed to ioremap prcmu register memory\n"); - return -ENOENT; + return -ENOMEM; } init_prcm_registers(); dbx500_fw_version_init(pdev, pdata->version_offset); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcdm"); if (!res) { dev_err(&pdev->dev, "no prcmu tcdm region provided\n"); - return -ENOENT; + return -EINVAL; } tcdm_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (!tcdm_base) { dev_err(&pdev->dev, "failed to ioremap prcmu-tcdm register memory\n"); - return -ENOENT; + return -ENOMEM; } /* Clean up the mailbox interrupts after pre-kernel code. */ @@ -3179,15 +3179,14 @@ static int db8500_prcmu_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq <= 0) { dev_err(&pdev->dev, "no prcmu irq provided\n"); - return -ENOENT; + return irq; } err = request_threaded_irq(irq, prcmu_irq_handler, prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL); if (err < 0) { pr_err("prcmu: Failed to allocate IRQ_DB8500_PRCMU1.\n"); - err = -EBUSY; - goto no_irq_return; + return err; } db8500_irq_init(np); @@ -3211,7 +3210,7 @@ static int db8500_prcmu_probe(struct platform_device *pdev) if (err) { mfd_remove_devices(&pdev->dev); pr_err("prcmu: Failed to add subdevices\n"); - goto no_irq_return; + return err; } } @@ -3219,12 +3218,10 @@ static int db8500_prcmu_probe(struct platform_device *pdev) if (err) { mfd_remove_devices(&pdev->dev); pr_err("prcmu: Failed to add ab8500 subdevice\n"); - goto no_irq_return; + return err; } pr_info("DB8500 PRCMU initialized\n"); - -no_irq_return: return err; } static const struct of_device_id db8500_prcmu_match[] = {
Also rid superfluous gotos and label. Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/mfd/db8500-prcmu.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)