From patchwork Mon Nov 3 16:15:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 40034 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 96EB020560 for ; Mon, 3 Nov 2014 16:16:13 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c41sf3050663eek.4 for ; Mon, 03 Nov 2014 08:16:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=1+6sZt/RxWrAaG3McKOrK7DIaIFRZKuRhgFBefJok2c=; b=HsRoY9bCMvUnMO+J5Au1JafnrH/6QVuqZh5B19JqvYy0RlosBGAWD97S9N5vcLPQre rTF3fYt+KztRo0O/7vgX8shWkgTG41CwaVjwF6e1un6elGmczxxCk1wV+VV2aFxXhSxa rVX2JZ0gw7eUDKAkJnWfwawofTioAYeSoOSusY41rKRM+21QljwrW1R1cKbJqo5QUgiO o0sFVO6FXlg6aD0Hr3npp2iwRjNm1TLtejkRoSx+4YUBmFZikJ+Pz4J16YJ7KpWxxAiD ENKGtWQyjc0BDh/fWZWEvi7idOra3RhpAy5HszpxpF6u7/8PMUWP2nuA8WsRk6YC6w9d CV0g== X-Gm-Message-State: ALoCoQmEPHAr/1o0ZwIq5y0GErovNvV56NaLBk2CcPEajLMf2G/ObKbNNb4STfH+TgGJXroxhvVu X-Received: by 10.152.37.37 with SMTP id v5mr85619laj.9.1415031372413; Mon, 03 Nov 2014 08:16:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.169 with SMTP id 9ls120033lan.109.gmail; Mon, 03 Nov 2014 08:16:12 -0800 (PST) X-Received: by 10.152.44.233 with SMTP id h9mr51836471lam.73.1415031372152; Mon, 03 Nov 2014 08:16:12 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id l3si33045907laf.89.2014.11.03.08.16.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:16:12 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id ge10so9771574lab.2 for ; Mon, 03 Nov 2014 08:16:12 -0800 (PST) X-Received: by 10.112.130.41 with SMTP id ob9mr51172839lbb.74.1415031371960; Mon, 03 Nov 2014 08:16:11 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.141.34 with SMTP id rl2csp14392lbb; Mon, 3 Nov 2014 08:16:11 -0800 (PST) X-Received: by 10.107.169.32 with SMTP id s32mr2728222ioe.68.1415031370193; Mon, 03 Nov 2014 08:16:10 -0800 (PST) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com. [209.85.223.182]) by mx.google.com with ESMTPS id g13si17519815ici.40.2014.11.03.08.16.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Nov 2014 08:16:10 -0800 (PST) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.223.182 as permitted sender) client-ip=209.85.223.182; Received: by mail-ie0-f182.google.com with SMTP id rd18so5580487iec.27 for ; Mon, 03 Nov 2014 08:16:09 -0800 (PST) X-Received: by 10.42.237.211 with SMTP id kp19mr2418325icb.70.1415031369533; Mon, 03 Nov 2014 08:16:09 -0800 (PST) Received: from localhost.localdomain (host86-129-140-59.range86-129.btcentralplus.com. [86.129.140.59]) by mx.google.com with ESMTPSA id y2sm3838674igl.8.2014.11.03.08.16.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Nov 2014 08:16:08 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Lee Jones , Linus Walleij Subject: [PATCH] mfd: db8500-prcmu: Provide sane error path values Date: Mon, 3 Nov 2014 16:15:56 +0000 Message-Id: <1415031356-11664-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Also rid superfluous gotos and label. Cc: Linus Walleij Signed-off-by: Lee Jones --- drivers/mfd/db8500-prcmu.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) 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[] = {