From patchwork Tue Apr 2 13:21:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15819 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8354D23E10 for ; Tue, 2 Apr 2013 13:22:26 +0000 (UTC) Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by fiordland.canonical.com (Postfix) with ESMTP id 24E69A18EE5 for ; Tue, 2 Apr 2013 13:22:26 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id b14sf518077qcs.0 for ; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=sIlxRZzbT2LpEJ+gQ34ANsIxP3q+HJk5R9y2vu+U+7k=; b=dAxqbj94b/fb+FEOtP4amUZNRA3J/7JqiCCNhTOBLAtk+Q2aELPP87nN/jxpDQ36i5 DlgCVSem6V/WSAl8fnG1Ct5U2GAKx14Yy7bsGl5p5LDMZHHGNAFkqK3QmkKbuDBdHZri HNM9PQmIBJIUrcdNew2mLvPgaUqkRM3mZus9LvfRyUSD2CGMtERCNcq6DBzhC44oLOlu /AggSebs1H/ib/mj1FZAYJK68QmQCM0VAHBNwCKrviQyXzJHUuWbQScn+ENYoBi0gcbU ywI7A9cIQEwZVVMntFM3COcuNiqt7Ka6EOyDNu0kZzTyYNd3Di+UZu61EgwgYdPVHNm5 gePg== X-Received: by 10.224.172.200 with SMTP id m8mr10529960qaz.0.1364908945372; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.24.35 with SMTP id r3ls257145qef.4.gmail; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) X-Received: by 10.52.19.239 with SMTP id i15mr10639017vde.47.1364908945200; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id p8si1066760vdw.10.2013.04.02.06.22.25 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:25 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id cy12so450897veb.32 for ; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) X-Received: by 10.58.223.134 with SMTP id qu6mr9633490vec.35.1364908945074; Tue, 02 Apr 2013 06:22:25 -0700 (PDT) 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.59.4.204 with SMTP id cg12csp125129ved; Tue, 2 Apr 2013 06:22:24 -0700 (PDT) X-Received: by 10.194.109.35 with SMTP id hp3mr9778494wjb.15.1364908944077; Tue, 02 Apr 2013 06:22:24 -0700 (PDT) Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]) by mx.google.com with ESMTPS id z11si4757787wij.78.2013.04.02.06.22.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:24 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22c is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22c; Received: by mail-wi0-f172.google.com with SMTP id hr17so2535841wib.5 for ; Tue, 02 Apr 2013 06:22:23 -0700 (PDT) X-Received: by 10.180.84.165 with SMTP id a5mr15857071wiz.6.1364908942122; Tue, 02 Apr 2013 06:22:22 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id n2sm18968272wiy.6.2013.04.02.06.22.20 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:21 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Samuel Ortiz Subject: [PATCH 8/9] mfd: db8500-prcmu: Return early if the TCPM cannot be located Date: Tue, 2 Apr 2013 14:21:55 +0100 Message-Id: <1364908916-29803-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> References: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlkNEezERYS5bAB5DbL/FH7EnYqAnHqy4Uvooz/qRFSMLLLw7MwDyP2rvsOiJ2XxQhSCB8i X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Currently we check to see if we obtained the Tightly Coupled Program Memory (TCPM) base and only execute the code within the check if we have it. It's more traditional to return early if we don't have it. This way we can flatten most of the function's code down to a single tab spacing. Cc: Samuel Ortiz Signed-off-by: Lee Jones --- drivers/mfd/db8500-prcmu.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 21f261b..1c4edbf8 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2794,6 +2794,7 @@ static void dbx500_fw_version_init(struct platform_device *pdev, { struct resource *res; void __iomem *tcpm_base; + u32 version; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "prcmu-tcpm"); @@ -2803,26 +2804,27 @@ static void dbx500_fw_version_init(struct platform_device *pdev, return; } tcpm_base = ioremap(res->start, resource_size(res)); - if (tcpm_base != NULL) { - u32 version; - - version = readl(tcpm_base + version_offset); - fw_info.version.project = (version & 0xFF); - fw_info.version.api_version = (version >> 8) & 0xFF; - fw_info.version.func_version = (version >> 16) & 0xFF; - fw_info.version.errata = (version >> 24) & 0xFF; - strncpy(fw_info.version.project_name, - fw_project_name(fw_info.version.project), - PRCMU_FW_PROJECT_NAME_LEN); - fw_info.valid = true; - pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", - fw_info.version.project_name, - fw_info.version.project, - fw_info.version.api_version, - fw_info.version.func_version, - fw_info.version.errata); - iounmap(tcpm_base); + if (!tcpm_base) { + dev_err(&pdev->dev, "no prcmu tcpm mem region provided\n"); + return; } + + version = readl(tcpm_base + version_offset); + fw_info.version.project = (version & 0xFF); + fw_info.version.api_version = (version >> 8) & 0xFF; + fw_info.version.func_version = (version >> 16) & 0xFF; + fw_info.version.errata = (version >> 24) & 0xFF; + strncpy(fw_info.version.project_name, + fw_project_name(fw_info.version.project), + PRCMU_FW_PROJECT_NAME_LEN); + fw_info.valid = true; + pr_info("PRCMU firmware: %s(%d), version %d.%d.%d\n", + fw_info.version.project_name, + fw_info.version.project, + fw_info.version.api_version, + fw_info.version.func_version, + fw_info.version.errata); + iounmap(tcpm_base); } void __init db8500_prcmu_early_init(void)