From patchwork Fri Nov 4 14:45:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 80868 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp18265qge; Fri, 4 Nov 2016 07:45:46 -0700 (PDT) X-Received: by 10.98.18.6 with SMTP id a6mr27658933pfj.184.1478270746707; Fri, 04 Nov 2016 07:45:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s17si16930418pgi.151.2016.11.04.07.45.46; Fri, 04 Nov 2016 07:45:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934990AbcKDOpp (ORCPT + 10 others); Fri, 4 Nov 2016 10:45:45 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36925 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934869AbcKDOpp (ORCPT ); Fri, 4 Nov 2016 10:45:45 -0400 Received: by mail-wm0-f46.google.com with SMTP id t79so54333820wmt.0 for ; Fri, 04 Nov 2016 07:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=o7nZIxlpiZ6+YG6BZOb4743pYXCtT6xxvqkLvx5jqfc=; b=HMX98PDY9GYmjI1Cqfkwc+gUaovZGWr0PILggZd+Stj2S6x0TUNisHb9JdBKRGhe1J GJwHaiVbsMHDxS5M1jMmAVb1oI59sKaZ4VbBVNFkiX0ZOd6s4TeSaj380KrrkUH+mhRJ 92aoLXgeZs+SBQ6f8zVpMmbHewcjjrXybFYug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=o7nZIxlpiZ6+YG6BZOb4743pYXCtT6xxvqkLvx5jqfc=; b=U5j/THDQRV1uGxJh6wJOHR8vwY7hyI8B+A1DmRUNNBihDj5jRQ85vYZ8pEQJCpBqhZ 2GvMvYIf2s2JMmiYM7PEAPBcMq5VSptg8HvZP0rICfRZVnh48XVjcEfv0DkRsEVUFN6V na4t+5YKRbV8R6Y93gd2FLI0JcLoyYEpnV+LzjStN98fnH+bzBvIWgApu2HkvCOsvE8K I+iz5uVOHiYLGcR2HG5pwr5RYnpp3wyJhjUTW3D3nhQQYlrCOj6XBHBboH2ZQP+Vql5F TZJZQfk62jPOsM2CM2+L+K7x4usFi/UCbczZ2hx3N3AOpISw50e9zy58BPVJFMVjt+69 9lyg== X-Gm-Message-State: ABUngvd0vxyulS+vGTziX3kbSwgs1CnJEs1flLF7t4NA5Y5dyUWC8/AEYY1pT9LQ03BR43I3 X-Received: by 10.194.122.67 with SMTP id lq3mr15510725wjb.54.1478270743860; Fri, 04 Nov 2016 07:45:43 -0700 (PDT) Received: from localhost.localdomain (host-2-98-102-117.as13285.net. [2.98.102.117]) by smtp.gmail.com with ESMTPSA id i15sm463523wjs.16.2016.11.04.07.45.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Nov 2016 07:45:43 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, alsa-devel@alsa-project.org Cc: tiwai@suse.com, kwestfie@codeaurora.org, linux-arm-msm@vger.kernel.org, srinivas.kandagatla@linaro.org Subject: [PATCH 1/2] ASoC: codecs: msm8916-wcd-analog: clean parse_dt() Date: Fri, 4 Nov 2016 14:45:39 +0000 Message-Id: <1478270740-3037-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move the code which is not parsing dt from pm8916_wcd_analog_parse_dt() to make it clear to reader. No functional changes done. Signed-off-by: Srinivas Kandagatla --- This change was suggested by Mark http://www.spinics.net/lists/alsa-devel/msg55878.html thanks, srini sound/soc/codecs/msm8916-wcd-analog.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) -- 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index d9f999b..50ad75a 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c @@ -802,7 +802,6 @@ static struct snd_soc_codec_driver pm8916_wcd_analog = { static int pm8916_wcd_analog_parse_dt(struct device *dev, struct pm8916_wcd_analog_priv *priv) { - int ret, i; if (of_property_read_bool(dev->of_node, "qcom,micbias1-ext-cap")) priv->micbias1_cap_mode = MICB_1_EN_EXT_BYP_CAP; @@ -814,21 +813,6 @@ static int pm8916_wcd_analog_parse_dt(struct device *dev, else priv->micbias2_cap_mode = MICB_1_EN_NO_EXT_BYP_CAP; - priv->mclk = devm_clk_get(dev, "mclk"); - if (IS_ERR(priv->mclk)) { - dev_err(dev, "failed to get mclk\n"); - return PTR_ERR(priv->mclk); - } - for (i = 0; i < ARRAY_SIZE(supply_names); i++) - priv->supplies[i].supply = supply_names[i]; - - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(priv->supplies), - priv->supplies); - if (ret) { - dev_err(dev, "Failed to get regulator supplies %d\n", ret); - return ret; - } - return 0; } @@ -836,7 +820,7 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) { struct pm8916_wcd_analog_priv *priv; struct device *dev = &pdev->dev; - int ret; + int ret, i; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -846,6 +830,22 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) if (ret < 0) return ret; + priv->mclk = devm_clk_get(dev, "mclk"); + if (IS_ERR(priv->mclk)) { + dev_err(dev, "failed to get mclk\n"); + return PTR_ERR(priv->mclk); + } + + for (i = 0; i < ARRAY_SIZE(supply_names); i++) + priv->supplies[i].supply = supply_names[i]; + + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(priv->supplies), + priv->supplies); + if (ret) { + dev_err(dev, "Failed to get regulator supplies %d\n", ret); + return ret; + } + ret = clk_prepare_enable(priv->mclk); if (ret < 0) { dev_err(dev, "failed to enable mclk %d\n", ret);