evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: db8500-prcmu: Provide sane error path values

Browse source 
Also rid superfluous gotos and label.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Lee Jones 2014-11-03 16:12:26 +00:00
parent 51a7e02bb6
commit 6bdf891a17
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/mfd/db8500-prcmu.c
View file

@ -3150,27 +3150,27 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu");
if (!res) { if (!res) {
dev_err(&pdev->dev, "no prcmu memory region provided\n"); 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)); prcmu_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
if (!prcmu_base) { if (!prcmu_base) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to ioremap prcmu register memory\n"); "failed to ioremap prcmu register memory\n");
return -ENOENT; return -ENOMEM;
} }
init_prcm_registers(); init_prcm_registers();
dbx500_fw_version_init(pdev, pdata->version_offset); dbx500_fw_version_init(pdev, pdata->version_offset);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcdm"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcdm");
if (!res) { if (!res) {
dev_err(&pdev->dev, "no prcmu tcdm region provided\n"); dev_err(&pdev->dev, "no prcmu tcdm region provided\n");
return -ENOENT; return -EINVAL;
} }
tcdm_base = devm_ioremap(&pdev->dev, res->start, tcdm_base = devm_ioremap(&pdev->dev, res->start,
resource_size(res)); resource_size(res));
if (!tcdm_base) { if (!tcdm_base) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to ioremap prcmu-tcdm register memory\n"); "failed to ioremap prcmu-tcdm register memory\n");
return -ENOENT; return -ENOMEM;
} }
/* Clean up the mailbox interrupts after pre-kernel code. */ /* 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); irq = platform_get_irq(pdev, 0);
if (irq <= 0) { if (irq <= 0) {
dev_err(&pdev->dev, "no prcmu irq provided\n"); dev_err(&pdev->dev, "no prcmu irq provided\n");
return -ENOENT; return irq;
} }
err = request_threaded_irq(irq, prcmu_irq_handler, err = request_threaded_irq(irq, prcmu_irq_handler,
prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL); prcmu_irq_thread_fn, IRQF_NO_SUSPEND, "prcmu", NULL);
if (err < 0) { if (err < 0) {
pr_err("prcmu: Failed to allocate IRQ_DB8500_PRCMU1.\n"); pr_err("prcmu: Failed to allocate IRQ_DB8500_PRCMU1.\n");
err = -EBUSY; return err;
goto no_irq_return;
} }
db8500_irq_init(np); db8500_irq_init(np);
@ -3211,7 +3210,7 @@ static int db8500_prcmu_probe(struct platform_device *pdev)
if (err) { if (err) {
mfd_remove_devices(&pdev->dev); mfd_remove_devices(&pdev->dev);
pr_err("prcmu: Failed to add subdevices\n"); 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) { if (err) {
mfd_remove_devices(&pdev->dev); mfd_remove_devices(&pdev->dev);
pr_err("prcmu: Failed to add ab8500 subdevice\n"); pr_err("prcmu: Failed to add ab8500 subdevice\n");
goto no_irq_return; return err;
} }
pr_info("DB8500 PRCMU initialized\n"); pr_info("DB8500 PRCMU initialized\n");
no_irq_return:
return err; return err;
} }
static const struct of_device_id db8500_prcmu_match[] = { static const struct of_device_id db8500_prcmu_match[] = {