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

Unverified Commit 5a619b9e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: use platform_data for machine drivers 



For some reason we have different mechanisms for passing data to
machine drivers. Use the solution used by Atom/SST and SOF instead of
using drv_data as done by Skylake.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b92826fa

sound/soc/intel/boards/kbl_rt5663_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static int kabylake_audio_probe(struct platform_device *pdev) 
	kabylake_audio_card->dev = &pdev->dev;

	snd_soc_card_set_drvdata(kabylake_audio_card, ctx);



	mach = dev_get_drvdata(&pdev->dev);

	mach = (&pdev->dev)->platform_data;

	if (mach)

		dmic_constraints = mach->mach_params.dmic_num == 2 ?

			&constraints_dmic_2ch : &constraints_dmic_channels;

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static int kabylake_audio_probe(struct platform_device *pdev) 
	kabylake_audio_card.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&kabylake_audio_card, ctx);



	mach = dev_get_drvdata(&pdev->dev);

	mach = (&pdev->dev)->platform_data;

	if (mach)

		dmic_constraints = mach->mach_params.dmic_num == 2 ?

			&constraints_dmic_2ch : &constraints_dmic_channels;

sound/soc/intel/boards/skl_hda_dsp_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int skl_hda_audio_probe(struct platform_device *pdev) 


	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);



	mach = dev_get_drvdata(&pdev->dev);

	mach = (&pdev->dev)->platform_data;

	if (!mach)

		return -EINVAL;

sound/soc/intel/boards/skl_nau88l25_max98357a.c

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int skylake_audio_probe(struct platform_device *pdev) 
	skylake_audio_card.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&skylake_audio_card, ctx);



	mach = dev_get_drvdata(&pdev->dev);

	mach = (&pdev->dev)->platform_data;

	if (mach)

		dmic_constraints = mach->mach_params.dmic_num == 2 ?

			&constraints_dmic_2ch : &constraints_dmic_channels;

sound/soc/intel/boards/skl_nau88l25_ssm4567.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static int skylake_audio_probe(struct platform_device *pdev) 
	skylake_audio_card.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&skylake_audio_card, ctx);



	mach = dev_get_drvdata(&pdev->dev);

	mach = (&pdev->dev)->platform_data;

	if (mach)

		dmic_constraints = mach->mach_params.dmic_num == 2 ?

			&constraints_dmic_2ch : &constraints_dmic_channels;