mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
ASoC: samsung: Remove superfluous snd_soc_jack_free_gpios() call
Since jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
7676b40606
commit
790b82898d
3 changed files with 0 additions and 28 deletions
|
@ -170,14 +170,6 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int h1940_uda1380_card_remove(struct snd_soc_card *card)
|
|
||||||
{
|
|
||||||
snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
|
|
||||||
hp_jack_gpios);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* s3c24xx digital audio interface glue - connects codec <--> CPU */
|
/* s3c24xx digital audio interface glue - connects codec <--> CPU */
|
||||||
static struct snd_soc_dai_link h1940_uda1380_dai[] = {
|
static struct snd_soc_dai_link h1940_uda1380_dai[] = {
|
||||||
{
|
{
|
||||||
|
@ -197,7 +189,6 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
|
||||||
static struct snd_soc_card h1940_asoc = {
|
static struct snd_soc_card h1940_asoc = {
|
||||||
.name = "h1940",
|
.name = "h1940",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.remove = h1940_uda1380_card_remove,
|
|
||||||
.dai_link = h1940_uda1380_dai,
|
.dai_link = h1940_uda1380_dai,
|
||||||
.num_links = ARRAY_SIZE(h1940_uda1380_dai),
|
.num_links = ARRAY_SIZE(h1940_uda1380_dai),
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#include "s3c24xx-i2s.h"
|
#include "s3c24xx-i2s.h"
|
||||||
|
|
||||||
static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd);
|
static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd);
|
||||||
static int rx1950_uda1380_card_remove(struct snd_soc_card *card);
|
|
||||||
static int rx1950_startup(struct snd_pcm_substream *substream);
|
static int rx1950_startup(struct snd_pcm_substream *substream);
|
||||||
static int rx1950_hw_params(struct snd_pcm_substream *substream,
|
static int rx1950_hw_params(struct snd_pcm_substream *substream,
|
||||||
struct snd_pcm_hw_params *params);
|
struct snd_pcm_hw_params *params);
|
||||||
|
@ -118,7 +117,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
||||||
static struct snd_soc_card rx1950_asoc = {
|
static struct snd_soc_card rx1950_asoc = {
|
||||||
.name = "rx1950",
|
.name = "rx1950",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.remove = rx1950_uda1380_card_remove,
|
|
||||||
.dai_link = rx1950_uda1380_dai,
|
.dai_link = rx1950_uda1380_dai,
|
||||||
.num_links = ARRAY_SIZE(rx1950_uda1380_dai),
|
.num_links = ARRAY_SIZE(rx1950_uda1380_dai),
|
||||||
|
|
||||||
|
@ -219,14 +217,6 @@ static int rx1950_uda1380_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rx1950_uda1380_card_remove(struct snd_soc_card *card)
|
|
||||||
{
|
|
||||||
snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
|
|
||||||
hp_jack_gpios);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init rx1950_init(void)
|
static int __init rx1950_init(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -160,14 +160,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int smartq_wm8987_card_remove(struct snd_soc_card *card)
|
|
||||||
{
|
|
||||||
snd_soc_jack_free_gpios(&smartq_jack, ARRAY_SIZE(smartq_jack_gpios),
|
|
||||||
smartq_jack_gpios);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct snd_soc_dai_link smartq_dai[] = {
|
static struct snd_soc_dai_link smartq_dai[] = {
|
||||||
{
|
{
|
||||||
.name = "wm8987",
|
.name = "wm8987",
|
||||||
|
@ -186,7 +178,6 @@ static struct snd_soc_dai_link smartq_dai[] = {
|
||||||
static struct snd_soc_card snd_soc_smartq = {
|
static struct snd_soc_card snd_soc_smartq = {
|
||||||
.name = "SmartQ",
|
.name = "SmartQ",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.remove = smartq_wm8987_card_remove,
|
|
||||||
.dai_link = smartq_dai,
|
.dai_link = smartq_dai,
|
||||||
.num_links = ARRAY_SIZE(smartq_dai),
|
.num_links = ARRAY_SIZE(smartq_dai),
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue