Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4323ec25 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4314f928

sound/soc/codecs/msm8916-wcd-analog.c

+17 −17
Original line number Diff line number Diff line
@@ -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);