From 4323ec250cbc675c7fc40edf5f791a736210747b Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 4 Nov 2016 14:45:39 +0000 Subject: [PATCH] ASoC: codecs: msm8916-wcd-analog: clean parse_dt() 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 Signed-off-by: Mark Brown --- sound/soc/codecs/msm8916-wcd-analog.c | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c index d9f999b14b28..50ad75ab10ea 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,11 +813,29 @@ static int pm8916_wcd_analog_parse_dt(struct device *dev, else priv->micbias2_cap_mode = MICB_1_EN_NO_EXT_BYP_CAP; + return 0; +} + +static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) +{ + struct pm8916_wcd_analog_priv *priv; + struct device *dev = &pdev->dev; + int ret, i; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + ret = pm8916_wcd_analog_parse_dt(dev, priv); + 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]; @@ -829,23 +846,6 @@ static int pm8916_wcd_analog_parse_dt(struct device *dev, return ret; } - return 0; -} - -static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) -{ - struct pm8916_wcd_analog_priv *priv; - struct device *dev = &pdev->dev; - int ret; - - priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - - ret = pm8916_wcd_analog_parse_dt(dev, priv); - if (ret < 0) - return ret; - ret = clk_prepare_enable(priv->mclk); if (ret < 0) { dev_err(dev, "failed to enable mclk %d\n", ret);