Unverified Commit 81d43ca1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5640: Use temporary variable for struct device 



Use temporary variable for struct device to make code neater.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211007165715.27463-3-andriy.shevchenko@linux.intel.com


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

sound/soc/intel/boards/bytcr_rt5640.c

+15 −17
Original line number Diff line number Diff line
@@ -1511,12 +1511,12 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	int aif;



	is_bytcr = false;

	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	/* register the soc card */

	byt_rt5640_card.dev = &pdev->dev;

	byt_rt5640_card.dev = dev;

	snd_soc_card_set_drvdata(&byt_rt5640_card, priv);



	/* fix index of codec dai */
@@ -1536,7 +1536,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
		put_device(&adev->dev);

		byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name;

	} else {

		dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id);

		dev_err(dev, "Error cannot find '%s' dev\n", mach->id);

		return -ENXIO;

	}
@@ -1579,13 +1579,13 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
							       &pkg_ctx);

		if (pkg_found) {

			if (chan_package.aif_value == 1) {

				dev_info(&pdev->dev, "BIOS Routing: AIF1 connected\n");

				dev_info(dev, "BIOS Routing: AIF1 connected\n");

				byt_rt5640_quirk |= BYT_RT5640_SSP0_AIF1;

			} else  if (chan_package.aif_value == 2) {

				dev_info(&pdev->dev, "BIOS Routing: AIF2 connected\n");

				dev_info(dev, "BIOS Routing: AIF2 connected\n");

				byt_rt5640_quirk |= BYT_RT5640_SSP0_AIF2;

			} else {

				dev_info(&pdev->dev, "BIOS Routing isn't valid, ignored\n");

				dev_info(dev, "BIOS Routing isn't valid, ignored\n");

				pkg_found = false;

			}

		}
@@ -1609,7 +1609,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	if (dmi_id)

		byt_rt5640_quirk = (unsigned long)dmi_id->driver_data;

	if (quirk_override != -1) {

		dev_info(&pdev->dev, "Overriding quirk 0x%lx => 0x%x\n",

		dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",

			 byt_rt5640_quirk, quirk_override);

		byt_rt5640_quirk = quirk_override;

	}
@@ -1623,12 +1623,12 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
		acpi_dev_add_driver_gpios(ACPI_COMPANION(priv->codec_dev),

					  byt_rt5640_hp_elitepad_1000g2_gpios);



		priv->hsmic_detect = devm_fwnode_gpiod_get(&pdev->dev, codec_dev->fwnode,

		priv->hsmic_detect = devm_fwnode_gpiod_get(dev, codec_dev->fwnode,

							   "headset-mic-detect", GPIOD_IN,

							   "headset-mic-detect");

		if (IS_ERR(priv->hsmic_detect)) {

			ret_val = PTR_ERR(priv->hsmic_detect);

			dev_err_probe(&pdev->dev, ret_val, "getting hsmic-detect GPIO\n");

			dev_err_probe(dev, ret_val, "getting hsmic-detect GPIO\n");

			goto err_device;

		}

	}
@@ -1638,7 +1638,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	if (ret_val)

		goto err_remove_gpios;



	log_quirks(&pdev->dev);

	log_quirks(dev);



	if ((byt_rt5640_quirk & BYT_RT5640_SSP2_AIF2) ||

	    (byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {
@@ -1653,11 +1653,11 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
		byt_rt5640_dais[dai_index].cpus->dai_name = "ssp0-port";



	if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {

		priv->mclk = devm_clk_get(&pdev->dev, "pmc_plt_clk_3");

		priv->mclk = devm_clk_get(dev, "pmc_plt_clk_3");

		if (IS_ERR(priv->mclk)) {

			ret_val = PTR_ERR(priv->mclk);



			dev_err(&pdev->dev,

			dev_err(dev,

				"Failed to get MCLK from pmc_plt_clk_3: %d\n",

				ret_val);
@@ -1713,7 +1713,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	if (ret_val)

		goto err;



	sof_parent = snd_soc_acpi_sof_parent(&pdev->dev);

	sof_parent = snd_soc_acpi_sof_parent(dev);



	/* set card and driver name */

	if (sof_parent) {
@@ -1728,11 +1728,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	if (sof_parent)

		dev->driver->pm = &snd_soc_pm_ops;



	ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5640_card);



	ret_val = devm_snd_soc_register_card(dev, &byt_rt5640_card);

	if (ret_val) {

		dev_err(&pdev->dev, "devm_snd_soc_register_card failed %d\n",

			ret_val);

		dev_err(dev, "devm_snd_soc_register_card failed %d\n", ret_val);

		goto err;

	}

	platform_set_drvdata(pdev, &byt_rt5640_card);