redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: Replace pdev with card in machine driver probe and remove 

In order to support cards instantiated without using soc-audio remove
the use of the platform device in the card probe() and remove() ops.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
hifive-unleashed-5.1
Mark Brown 2011-01-26 14:17:20 +00:00
parent 70b2ac126a
commit e7361ec499
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc.h
View File

@ -649,8 +649,8 @@ struct snd_soc_card {
bool instantiated;
int (*probe)(struct platform_device *pdev);
int (*remove)(struct platform_device *pdev);
int (*probe)(struct snd_soc_card *card);
int (*remove)(struct snd_soc_card *card);
/* the pre and post PM functions are used to do any PM work before and
* after the codec and DAI's do any PM work. */

6
sound/soc/fsl/mpc8610_hpcd.c
View File

@ -53,9 +53,8 @@ struct mpc8610_hpcd_data {
*
* Here we program the DMACR and PMUXCR registers.
*/
static int mpc8610_hpcd_machine_probe(struct platform_device *sound_device)
static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card)
{
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct mpc8610_hpcd_data *machine_data =
container_of(card, struct mpc8610_hpcd_data, card);
struct ccsr_guts_86xx __iomem *guts;
@ -138,9 +137,8 @@ static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream)
* This function is called to remove the sound device for one SSI. We
* de-program the DMACR and PMUXCR register.
*/
static int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card)
{
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct mpc8610_hpcd_data *machine_data =
container_of(card, struct mpc8610_hpcd_data, card);
struct ccsr_guts_86xx __iomem *guts;

6
sound/soc/fsl/p1022_ds.c
View File

@ -85,9 +85,8 @@ struct machine_data {
*
* Here we program the DMACR and PMUXCR registers.
*/
static int p1022_ds_machine_probe(struct platform_device *sound_device)
static int p1022_ds_machine_probe(struct snd_soc_card *card)
{
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct ccsr_guts_85xx __iomem *guts;
@ -160,9 +159,8 @@ static int p1022_ds_startup(struct snd_pcm_substream *substream)
* This function is called to remove the sound device for one SSI. We
* de-program the DMACR and PMUXCR register.
*/
static int p1022_ds_machine_remove(struct platform_device *sound_device)
static int p1022_ds_machine_remove(struct snd_soc_card *card)
{
struct snd_soc_card *card = platform_get_drvdata(sound_device);
struct machine_data *mdata =
container_of(card, struct machine_data, card);
struct ccsr_guts_85xx __iomem *guts;

4
sound/soc/pxa/tosa.c
View File

@ -237,7 +237,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
},
};
static int tosa_probe(struct platform_device *dev)
static int tosa_probe(struct snd_soc_card *card)
{
int ret;
@ -251,7 +251,7 @@ static int tosa_probe(struct platform_device *dev)
return ret;
}
static int tosa_remove(struct platform_device *dev)
static int tosa_remove(struct snd_soc_card *card)
{
gpio_free(TOSA_GPIO_L_MUTE);
return 0;

4
sound/soc/pxa/zylonite.c
View File

@ -189,7 +189,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
},
};
static int zylonite_probe(struct platform_device *pdev)
static int zylonite_probe(struct snd_soc_card *card)
{
int ret;
@ -216,7 +216,7 @@ static int zylonite_probe(struct platform_device *pdev)
return 0;
}
static int zylonite_remove(struct platform_device *pdev)
static int zylonite_remove(struct snd_soc_card *card)
{
if (clk_pout) {
clk_disable(pout);

8
sound/soc/soc-core.c
View File

@ -1717,7 +1717,6 @@ static int snd_soc_init_codec_cache(struct snd_soc_codec *codec,
static void snd_soc_instantiate_card(struct snd_soc_card *card)
{
struct platform_device *pdev = to_platform_device(card->dev);
struct snd_soc_codec *codec;
struct snd_soc_codec_conf *codec_conf;
enum snd_soc_compress_type compress_type;
@ -1781,7 +1780,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
/* initialise the sound card only once */
if (card->probe) {
ret = card->probe(pdev);
ret = card->probe(card);
if (ret < 0)
goto card_probe_error;
}
@ -1842,7 +1841,7 @@ probe_dai_err:
card_probe_error:
if (card->remove)
card->remove(pdev);
card->remove(card);
snd_card_free(card->snd_card);
@ -1888,7 +1887,6 @@ static int soc_probe(struct platform_device *pdev)
static int soc_cleanup_card_resources(struct snd_soc_card *card)
{
struct platform_device *pdev = to_platform_device(card->dev);
int i;
/* make sure any delayed work runs */
@ -1909,7 +1907,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
/* remove the card */
if (card->remove)
card->remove(pdev);
card->remove(card);
kfree(card->rtd);
snd_card_free(card->snd_card);