Commit f7b93159 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/davinci',... 

Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/davinci', 'asoc/topic/fsl', 'asoc/topic/hdmi' and 'asoc/topic/intel' into asoc-next
parents 97e15d9a 76b0d1f5 14a998be c759241f 95291382 5b97c0f1

sound/soc/blackfin/bf5xx-ad1836.c

+1 −10
Original line number Diff line number Diff line
@@ -87,27 +87,18 @@ static int bf5xx_ad1836_driver_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;

	platform_set_drvdata(pdev, card);



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

		dev_err(&pdev->dev, "Failed to register card\n");

	return ret;

}



static int bf5xx_ad1836_driver_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



static struct platform_driver bf5xx_ad1836_driver = {

	.driver = {

		.name = "bfin-snd-ad1836",

		.pm = &snd_soc_pm_ops,

	},

	.probe = bf5xx_ad1836_driver_probe,

	.remove = bf5xx_ad1836_driver_remove,

};

module_platform_driver(bf5xx_ad1836_driver);

sound/soc/blackfin/bfin-eval-adau1373.c

+1 −11
Original line number Diff line number Diff line
@@ -154,16 +154,7 @@ static int bfin_eval_adau1373_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	return snd_soc_register_card(&bfin_eval_adau1373);

}



static int bfin_eval_adau1373_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);



	return 0;

	return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1373);

}



static struct platform_driver bfin_eval_adau1373_driver = {
@@ -172,7 +163,6 @@ static struct platform_driver bfin_eval_adau1373_driver = { 
		.pm = &snd_soc_pm_ops,

	},

	.probe = bfin_eval_adau1373_probe,

	.remove = bfin_eval_adau1373_remove,

};



module_platform_driver(bfin_eval_adau1373_driver);

sound/soc/blackfin/bfin-eval-adau1701.c

+1 −11
Original line number Diff line number Diff line
@@ -94,16 +94,7 @@ static int bfin_eval_adau1701_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	return snd_soc_register_card(&bfin_eval_adau1701);

}



static int bfin_eval_adau1701_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);



	return 0;

	return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1701);

}



static struct platform_driver bfin_eval_adau1701_driver = {
@@ -112,7 +103,6 @@ static struct platform_driver bfin_eval_adau1701_driver = { 
		.pm = &snd_soc_pm_ops,

	},

	.probe = bfin_eval_adau1701_probe,

	.remove = bfin_eval_adau1701_remove,

};



module_platform_driver(bfin_eval_adau1701_driver);

sound/soc/blackfin/bfin-eval-adav80x.c

+1 −11
Original line number Diff line number Diff line
@@ -119,16 +119,7 @@ static int bfin_eval_adav80x_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	return snd_soc_register_card(&bfin_eval_adav80x);

}



static int bfin_eval_adav80x_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);



	return 0;

	return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adav80x);

}



static const struct platform_device_id bfin_eval_adav80x_ids[] = {
@@ -144,7 +135,6 @@ static struct platform_driver bfin_eval_adav80x_driver = { 
		.pm = &snd_soc_pm_ops,

	},

	.probe = bfin_eval_adav80x_probe,

	.remove = bfin_eval_adav80x_remove,

	.id_table = bfin_eval_adav80x_ids,

};

sound/soc/codecs/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX9877 if I2C

	select SND_SOC_MC13783 if MFD_MC13XXX

	select SND_SOC_ML26124 if I2C

	select SND_SOC_HDMI_CODEC

	select SND_SOC_PCM1681 if I2C

	select SND_SOC_PCM1792A if SPI_MASTER

	select SND_SOC_PCM3008
@@ -447,9 +446,6 @@ config SND_SOC_BT_SCO 
config SND_SOC_DMIC

	tristate



config SND_SOC_HDMI_CODEC

       tristate "HDMI stub CODEC"



config SND_SOC_ES8328

	tristate "Everest Semi ES8328 CODEC"