From patchwork Tue Oct 21 12:41:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 39117 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E2D5C202DB for ; Tue, 21 Oct 2014 12:48:30 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id bs8sf910026wib.3 for ; Tue, 21 Oct 2014 05:48:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=gpkstrLTnbr13oLR9vBkbsgypgIbfypL0SQgov/3Tvo=; b=TEkBDgsCppbp3peW6J/xl5ubvZMizteeShWe6OKbflCMCPCWM3F+myrhLUN4F0FNNR bZNjTOW/6z6OrWgud1kppCTS/zm3Prt7mlUs3bBz5aoGDHMwJcoBg9jUDFgtb/P8d4cV uTAetTQdiP260UbpGZLtmP8DJwCNjeYAfnuxcl7yQGkqituqQ9DhVKWqy6ozoM0P1bf+ L7VdIxWTz/TF8nSak3zGCyMzSHT5tP3HI6+O+px2A7LVlgwWmjltC0tkzdqCPXuZ1URV KsWy0dMZU5fZbxsIfKI4c2PBJXHnQAWg9ploMrmde7bjg0Kc8DSxVvwWBPJBje/XTWUo fWtA== X-Gm-Message-State: ALoCoQntQ3ybbG1X9jhMmw8BiIQw3T1NwNCSbL5rwOjdOrROxUG4iy5q2TdMIR1MxJJk5tRWU2rw X-Received: by 10.112.99.72 with SMTP id eo8mr1710572lbb.7.1413895331554; Tue, 21 Oct 2014 05:42:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.74 with SMTP id w10ls54814laj.99.gmail; Tue, 21 Oct 2014 05:42:11 -0700 (PDT) X-Received: by 10.152.44.233 with SMTP id h9mr34240540lam.73.1413895331407; Tue, 21 Oct 2014 05:42:11 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id w5si16341027lae.80.2014.10.21.05.42.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Oct 2014 05:42:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id pv20so944830lab.6 for ; Tue, 21 Oct 2014 05:42:11 -0700 (PDT) X-Received: by 10.152.116.102 with SMTP id jv6mr23201715lab.40.1413895331129; Tue, 21 Oct 2014 05:42:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp488791lbz; Tue, 21 Oct 2014 05:42:10 -0700 (PDT) X-Received: by 10.68.93.228 with SMTP id cx4mr34536675pbb.45.1413895329137; Tue, 21 Oct 2014 05:42:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fa4si10878840pbc.238.2014.10.21.05.42.08 for ; Tue, 21 Oct 2014 05:42:09 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932524AbaJUMmH (ORCPT + 5 others); Tue, 21 Oct 2014 08:42:07 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:57631 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932523AbaJUMmF (ORCPT ); Tue, 21 Oct 2014 08:42:05 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9LCg33O031921; Tue, 21 Oct 2014 07:42:03 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9LCg3mN019185; Tue, 21 Oct 2014 07:42:03 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Tue, 21 Oct 2014 07:42:03 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9LCfoo5012514; Tue, 21 Oct 2014 07:42:01 -0500 From: Roger Quadros To: CC: , , , Roger Quadros , Sekhar Nori Subject: [PATCH 5/5] ARM: OMAP2+: gpmc: Sanity check GPMC fck on probe Date: Tue, 21 Oct 2014 15:41:49 +0300 Message-ID: <1413895309-9152-6-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1413895309-9152-1-git-send-email-rogerq@ti.com> References: <1413895309-9152-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: rogerq@ti.com 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.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This prevents potential division by zero errors if GPMC fck turns out to be zero due to faulty clock data. Use resource managed clk_get() API. Signed-off-by: Roger Quadros Signed-off-by: Sekhar Nori --- arch/arm/mach-omap2/gpmc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 437fb6f..104bc2c 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -204,11 +204,6 @@ static unsigned long gpmc_get_fclk_period(void) { unsigned long rate = clk_get_rate(gpmc_l3_clk); - if (rate == 0) { - printk(KERN_WARNING "gpmc_l3_clk not enabled\n"); - return 0; - } - rate /= 1000; rate = 1000000000 / rate; /* In picoseconds */ @@ -1692,13 +1687,18 @@ static int gpmc_probe(struct platform_device *pdev) else gpmc_irq = res->start; - gpmc_l3_clk = clk_get(&pdev->dev, "fck"); + gpmc_l3_clk = devm_clk_get(&pdev->dev, "fck"); if (IS_ERR(gpmc_l3_clk)) { - dev_err(&pdev->dev, "error: clk_get\n"); + dev_err(&pdev->dev, "Failed to get GPMC fck\n"); gpmc_irq = 0; return PTR_ERR(gpmc_l3_clk); } + if (!clk_get_rate(gpmc_l3_clk)) { + dev_err(&pdev->dev, "Invalid GPMC fck clock rate\n"); + return -EINVAL; + } + pm_runtime_enable(&pdev->dev); pm_runtime_get_sync(&pdev->dev); @@ -1741,7 +1741,6 @@ static int gpmc_probe(struct platform_device *pdev) rc = gpmc_probe_dt(pdev); if (rc < 0) { pm_runtime_put_sync(&pdev->dev); - clk_put(gpmc_l3_clk); dev_err(gpmc_dev, "failed to probe DT parameters\n"); return rc; }