From patchwork Sun Jan 22 21:17:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 92195 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1071673qgi; Sun, 22 Jan 2017 21:17:01 -0800 (PST) X-Received: by 10.99.217.85 with SMTP id e21mr22244212pgj.79.1485148621615; Sun, 22 Jan 2017 21:17:01 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j62si14506190pgc.104.2017.01.22.21.17.01; Sun, 22 Jan 2017 21:17:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750753AbdAWFQ6 (ORCPT + 25 others); Mon, 23 Jan 2017 00:16:58 -0500 Received: from mail-pf0-f170.google.com ([209.85.192.170]:35031 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750729AbdAWFQ4 (ORCPT ); Mon, 23 Jan 2017 00:16:56 -0500 Received: by mail-pf0-f170.google.com with SMTP id f144so38152634pfa.2 for ; Sun, 22 Jan 2017 21:16:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l7DMw6lErxcylnOblgHllDUR7mYjKryhZvt5s6Wu72k=; b=Jb3W49lxCJDh2tX5VM5Ky4c9r18bes+NJGUjpeVlBJGKKWGx+UYGLtgf1Spkxa9cZu sHTCX/YdPfmqvoPVT061wpMFDFpAPfPq1dS5bgKAkyVscPyN25bkuO5yUMigjSe09C1M BDggu+JLY3NA8MPb/Uv0R7bPj0RwrFJHYw6M0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l7DMw6lErxcylnOblgHllDUR7mYjKryhZvt5s6Wu72k=; b=uTdkj46v4KW0YBvEgKY6un7hfqrxiHt+iRMBPpC4VmozBSJeET7Zdke1xo9+DJNoOx ZibrpI2CId0ONuD/Z+s/FnrH+bXguREXCulKKQm0JUNizXZVC90T5ni0iey0cJtAd4oJ pD6dqb6YbPjc66iknCs5cOYf0T5AC0+M9ITkxK9DEKpoeNRg+55HjQRJvyyhBsrXFsye 9zST/g1z4/wiIZphiOJy33w4omxef9Se9wbQAQe/P73+oSyPuGFQv7g+PD0r6kIdi/7f lb04YmCPlZPuxHqBhrZOLFmlNE8uDJyljjCdGDuaYi7UvEKNEWHzpsaNziljhTeiwU9n 82Yw== X-Gm-Message-State: AIkVDXJDkFMTyMPOZDSRvBVY36MQOUJfJVAVhVFWuQZVYCztUaFb00PShhS4zloyl+6MAHp6 X-Received: by 10.84.233.132 with SMTP id l4mr40647490plk.15.1485148615326; Sun, 22 Jan 2017 21:16:55 -0800 (PST) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id 18sm33169100pgf.28.2017.01.22.21.16.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 21:16:54 -0800 (PST) From: Bjorn Andersson To: Kishon Vijay Abraham I Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v2 2/4] phy: qcom-ufs: Correct usage of regulator_get() Date: Sun, 22 Jan 2017 13:17:47 -0800 Message-Id: <20170122211749.22803-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170122211749.22803-1-bjorn.andersson@linaro.org> References: <20170122211749.22803-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When regulator_get() tries to resolve a regulator supply but fail to find a matching property in DeviceTree it returns a dummy regulator, if a matching supply is specified but unavailable the regulator core will return an error. Based on this we should not ignore errors upon failing to acquire the optional "vddp-ref-clk" supply. Reviewed-by: Vivek Gautam Reviewed-by: Subhash Jadavani Signed-off-by: Bjorn Andersson --- Changes since v1: - Picked up reviewd-bys from Vivek and Subhash drivers/phy/phy-qcom-ufs.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) -- 2.11.0 diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c index 4d7f3c018223..bbd317158084 100644 --- a/drivers/phy/phy-qcom-ufs.c +++ b/drivers/phy/phy-qcom-ufs.c @@ -210,8 +210,9 @@ int ufs_qcom_phy_init_clks(struct ufs_qcom_phy *phy_common) } EXPORT_SYMBOL_GPL(ufs_qcom_phy_init_clks); -static int __ufs_qcom_phy_init_vreg(struct device *dev, - struct ufs_qcom_phy_vreg *vreg, const char *name, bool optional) +static int ufs_qcom_phy_init_vreg(struct device *dev, + struct ufs_qcom_phy_vreg *vreg, + const char *name) { int err = 0; @@ -221,9 +222,7 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev, vreg->reg = devm_regulator_get(dev, name); if (IS_ERR(vreg->reg)) { err = PTR_ERR(vreg->reg); - vreg->reg = NULL; - if (!optional) - dev_err(dev, "failed to get %s, %d\n", name, err); + dev_err(dev, "failed to get %s, %d\n", name, err); goto out; } @@ -263,12 +262,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev, return err; } -static int ufs_qcom_phy_init_vreg(struct device *dev, - struct ufs_qcom_phy_vreg *vreg, const char *name) -{ - return __ufs_qcom_phy_init_vreg(dev, vreg, name, false); -} - int ufs_qcom_phy_init_vregulators(struct ufs_qcom_phy *phy_common) { int err; @@ -284,9 +277,9 @@ int ufs_qcom_phy_init_vregulators(struct ufs_qcom_phy *phy_common) if (err) goto out; - /* vddp-ref-clk-* properties are optional */ - __ufs_qcom_phy_init_vreg(phy_common->dev, &phy_common->vddp_ref_clk, - "vddp-ref-clk", true); + err = ufs_qcom_phy_init_vreg(phy_common->dev, &phy_common->vddp_ref_clk, + "vddp-ref-clk"); + out: return err; }