Unverified Commit 952c0e26 authored by Tang Bin's avatar Tang Bin Committed by Mark Brown
Browse files

ASoC: qcom: Use the defined variable to simplify code 



Use the defined variable "dev" to make the code cleaner.

Signed-off-by: default avatarZhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: default avatarTang Bin <tangbin@cmss.chinamobile.com>
Link: https://lore.kernel.org/r/20200504065947.12172-1-tangbin@cmss.chinamobile.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d696a614

sound/soc/qcom/lpass-apq8016.c

+4 −5
Original line number Diff line number Diff line
@@ -166,28 +166,27 @@ static int apq8016_lpass_init(struct platform_device *pdev) 


	drvdata->pcnoc_mport_clk = devm_clk_get(dev, "pcnoc-mport-clk");

	if (IS_ERR(drvdata->pcnoc_mport_clk)) {

		dev_err(&pdev->dev, "error getting pcnoc-mport-clk: %ld\n",

		dev_err(dev, "error getting pcnoc-mport-clk: %ld\n",

			PTR_ERR(drvdata->pcnoc_mport_clk));

		return PTR_ERR(drvdata->pcnoc_mport_clk);

	}



	ret = clk_prepare_enable(drvdata->pcnoc_mport_clk);

	if (ret) {

		dev_err(&pdev->dev, "Error enabling pcnoc-mport-clk: %d\n",

			ret);

		dev_err(dev, "Error enabling pcnoc-mport-clk: %d\n", ret);

		return ret;

	}



	drvdata->pcnoc_sway_clk = devm_clk_get(dev, "pcnoc-sway-clk");

	if (IS_ERR(drvdata->pcnoc_sway_clk)) {

		dev_err(&pdev->dev, "error getting pcnoc-sway-clk: %ld\n",

		dev_err(dev, "error getting pcnoc-sway-clk: %ld\n",

			PTR_ERR(drvdata->pcnoc_sway_clk));

		return PTR_ERR(drvdata->pcnoc_sway_clk);

	}



	ret = clk_prepare_enable(drvdata->pcnoc_sway_clk);

	if (ret) {

		dev_err(&pdev->dev, "Error enabling pcnoc_sway_clk: %d\n", ret);

		dev_err(dev, "Error enabling pcnoc_sway_clk: %d\n", ret);

		return ret;

	}

sound/soc/qcom/lpass-cpu.c

+18 −21
Original line number Diff line number Diff line
@@ -425,12 +425,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 


	dsp_of_node = of_parse_phandle(pdev->dev.of_node, "qcom,adsp", 0);

	if (dsp_of_node) {

		dev_err(&pdev->dev, "DSP exists and holds audio resources\n");

		dev_err(dev, "DSP exists and holds audio resources\n");

		return -EBUSY;

	}



	drvdata = devm_kzalloc(&pdev->dev, sizeof(struct lpass_data),

			GFP_KERNEL);

	drvdata = devm_kzalloc(dev, sizeof(struct lpass_data), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;

	platform_set_drvdata(pdev, drvdata);
@@ -444,9 +443,9 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpass-lpaif");



	drvdata->lpaif = devm_ioremap_resource(&pdev->dev, res);

	drvdata->lpaif = devm_ioremap_resource(dev, res);

	if (IS_ERR((void const __force *)drvdata->lpaif)) {

		dev_err(&pdev->dev, "error mapping reg resource: %ld\n",

		dev_err(dev, "error mapping reg resource: %ld\n",

				PTR_ERR((void const __force *)drvdata->lpaif));

		return PTR_ERR((void const __force *)drvdata->lpaif);

	}
@@ -455,10 +454,10 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
						variant->wrdma_channels +

						variant->wrdma_channel_start);



	drvdata->lpaif_map = devm_regmap_init_mmio(&pdev->dev, drvdata->lpaif,

	drvdata->lpaif_map = devm_regmap_init_mmio(dev, drvdata->lpaif,

			&lpass_cpu_regmap_config);

	if (IS_ERR(drvdata->lpaif_map)) {

		dev_err(&pdev->dev, "error initializing regmap: %ld\n",

		dev_err(dev, "error initializing regmap: %ld\n",

			PTR_ERR(drvdata->lpaif_map));

		return PTR_ERR(drvdata->lpaif_map);

	}
@@ -468,10 +467,10 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 


	for (i = 0; i < variant->num_dai; i++) {

		dai_id = variant->dai_driver[i].id;

		drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(&pdev->dev,

		drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(dev,

					     variant->dai_osr_clk_names[i]);

		if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) {

			dev_warn(&pdev->dev,

			dev_warn(dev,

				"%s() error getting optional %s: %ld\n",

				__func__,

				variant->dai_osr_clk_names[i],
@@ -480,10 +479,10 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
			drvdata->mi2s_osr_clk[dai_id] = NULL;

		}



		drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(&pdev->dev,

		drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(dev,

						variant->dai_bit_clk_names[i]);

		if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) {

			dev_err(&pdev->dev,

			dev_err(dev,

				"error getting %s: %ld\n",

				variant->dai_bit_clk_names[i],

				PTR_ERR(drvdata->mi2s_bit_clk[dai_id]));
@@ -491,41 +490,39 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) 
		}

	}



	drvdata->ahbix_clk = devm_clk_get(&pdev->dev, "ahbix-clk");

	drvdata->ahbix_clk = devm_clk_get(dev, "ahbix-clk");

	if (IS_ERR(drvdata->ahbix_clk)) {

		dev_err(&pdev->dev, "error getting ahbix-clk: %ld\n",

		dev_err(dev, "error getting ahbix-clk: %ld\n",

			PTR_ERR(drvdata->ahbix_clk));

		return PTR_ERR(drvdata->ahbix_clk);

	}



	ret = clk_set_rate(drvdata->ahbix_clk, LPASS_AHBIX_CLOCK_FREQUENCY);

	if (ret) {

		dev_err(&pdev->dev, "error setting rate on ahbix_clk: %d\n",

			ret);

		dev_err(dev, "error setting rate on ahbix_clk: %d\n", ret);

		return ret;

	}

	dev_dbg(&pdev->dev, "set ahbix_clk rate to %lu\n",

	dev_dbg(dev, "set ahbix_clk rate to %lu\n",

		clk_get_rate(drvdata->ahbix_clk));



	ret = clk_prepare_enable(drvdata->ahbix_clk);

	if (ret) {

		dev_err(&pdev->dev, "error enabling ahbix_clk: %d\n", ret);

		dev_err(dev, "error enabling ahbix_clk: %d\n", ret);

		return ret;

	}



	ret = devm_snd_soc_register_component(&pdev->dev,

	ret = devm_snd_soc_register_component(dev,

					      &lpass_cpu_comp_driver,

					      variant->dai_driver,

					      variant->num_dai);

	if (ret) {

		dev_err(&pdev->dev, "error registering cpu driver: %d\n", ret);

		dev_err(dev, "error registering cpu driver: %d\n", ret);

		goto err_clk;

	}



	ret = asoc_qcom_lpass_platform_register(pdev);

	if (ret) {

		dev_err(&pdev->dev, "error registering platform driver: %d\n",

			ret);

		dev_err(dev, "error registering platform driver: %d\n", ret);

		goto err_clk;

	}