openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: palm27x: register card in platform_driver probe 

Remove creation of an soc-audio device from the machine platform_driver probe
function, and add a call to snd_soc_register_card() instead.

The current code still works, but this mechanism has been deprecated, if I'm not
mistaken.  The ASoC core code produces the warning "ASoC: machine Palm/PXA27x
should use snd_soc_register_card()"

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mike Dunn 2012-12-29 10:53:18 -08:00 committed by Mark Brown
parent 016fb39c98
commit 01a61f490c
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/pxa/palm27x.c
View File

@ -144,8 +144,6 @@ static struct snd_soc_card palm27x_asoc = {
.num_dapm_routes = ARRAY_SIZE(audio_map) .num_dapm_routes = ARRAY_SIZE(audio_map)
}; };
static struct platform_device *palm27x_snd_device;
static int palm27x_asoc_probe(struct platform_device *pdev) static int palm27x_asoc_probe(struct platform_device *pdev)
{ {
int ret; int ret;
@ -162,27 +160,18 @@ static int palm27x_asoc_probe(struct platform_device *pdev)
hs_jack_gpios[0].gpio = ((struct palm27x_asoc_info *) hs_jack_gpios[0].gpio = ((struct palm27x_asoc_info *)
(pdev->dev.platform_data))->jack_gpio; (pdev->dev.platform_data))->jack_gpio;
palm27x_snd_device = platform_device_alloc("soc-audio", -1); palm27x_asoc.dev = &pdev->dev;
if (!palm27x_snd_device)
return -ENOMEM;
platform_set_drvdata(palm27x_snd_device, &palm27x_asoc);
ret = platform_device_add(palm27x_snd_device);
if (ret != 0)
goto put_device;
return 0;
put_device:
platform_device_put(palm27x_snd_device);
ret = snd_soc_register_card(&palm27x_asoc);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret; return ret;
} }
static int palm27x_asoc_remove(struct platform_device *pdev) static int palm27x_asoc_remove(struct platform_device *pdev)
{ {
platform_device_unregister(palm27x_snd_device); snd_soc_unregister_card(&palm27x_asoc);
return 0; return 0;
} }