unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

ASoC: tosa: move gpio probing to machine callbacks

Browse source 
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dmitry Baryshkov 2008-11-25 09:35:21 +03:00 committed by Mark Brown
parent 4451582f7e
commit 5c0d7bb797
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sound/soc/pxa/tosa.c
View file

@ -230,10 +230,32 @@ static struct snd_soc_dai_link tosa_dai[] = {
}, },
}; };
static int tosa_probe(struct platform_device *dev)
{
int ret;
ret = gpio_request(TOSA_GPIO_L_MUTE, "Headphone Jack");
if (ret)
return ret;
ret = gpio_direction_output(TOSA_GPIO_L_MUTE, 0);
if (ret)
gpio_free(TOSA_GPIO_L_MUTE);
return ret;
}
static int tosa_remove(struct platform_device *dev)
{
gpio_free(TOSA_GPIO_L_MUTE);
return 0;
}
static struct snd_soc_card tosa = { static struct snd_soc_card tosa = {
.name = "Tosa", .name = "Tosa",
.dai_link = tosa_dai, .dai_link = tosa_dai,
.num_links = ARRAY_SIZE(tosa_dai), .num_links = ARRAY_SIZE(tosa_dai),
.probe = tosa_probe,
.remove = tosa_remove,
}; };
static struct snd_soc_device tosa_snd_devdata = { static struct snd_soc_device tosa_snd_devdata = {
@ -251,11 +273,6 @@ static int __init tosa_init(void)
if (!machine_is_tosa()) if (!machine_is_tosa())
return -ENODEV; return -ENODEV;
ret = gpio_request(TOSA_GPIO_L_MUTE, "Headphone Jack");
if (ret)
return ret;
gpio_direction_output(TOSA_GPIO_L_MUTE, 0);
tosa_snd_device = platform_device_alloc("soc-audio", -1); tosa_snd_device = platform_device_alloc("soc-audio", -1);
if (!tosa_snd_device) { if (!tosa_snd_device) {
ret = -ENOMEM; ret = -ENOMEM;
@ -272,15 +289,12 @@ static int __init tosa_init(void)
platform_device_put(tosa_snd_device); platform_device_put(tosa_snd_device);
err_alloc: err_alloc:
gpio_free(TOSA_GPIO_L_MUTE);
return ret; return ret;
} }
static void __exit tosa_exit(void) static void __exit tosa_exit(void)
{ {
platform_device_unregister(tosa_snd_device); platform_device_unregister(tosa_snd_device);
gpio_free(TOSA_GPIO_L_MUTE);
} }
module_init(tosa_init); module_init(tosa_init);