Merge branch 'fix/asoc' into for-linus (dd501d94) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/fsl/mpc8610_hpcd.c

+6 −12

Original line number	Diff line number	Diff line
		@@ -182,16 +182,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
		.startup = mpc8610_hpcd_startup,
		};

		/**
		* mpc8610_hpcd_machine: ASoC machine data
		*/
		static struct snd_soc_card mpc8610_hpcd_machine = {
		.probe = mpc8610_hpcd_machine_probe,
		.remove = mpc8610_hpcd_machine_remove,
		.name = "MPC8610 HPCD",
		.num_links = 1,
		};

		/**
		* mpc8610_hpcd_probe: OF probe function for the fabric driver
		*
		@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
		machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */
		machine_data->dai.ops = &mpc8610_hpcd_ops;

		mpc8610_hpcd_machine.dai_link = &machine_data->dai;
		machine_data->machine.probe = mpc8610_hpcd_machine_probe;
		machine_data->machine.remove = mpc8610_hpcd_machine_remove;
		machine_data->machine.name = "MPC8610 HPCD";
		machine_data->machine.num_links = 1;
		machine_data->machine.dai_link = &machine_data->dai;

		/* Allocate a new audio platform device structure */
		sound_device = platform_device_alloc("soc-audio", -1);
		@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
		goto error;
		}

		machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
		machine_data->sound_devdata.card = &machine_data->machine;
		machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
		machine_data->machine.platform = &fsl_soc_platform;