UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: tegra: 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:
Takashi Iwai 2017-08-22 13:59:51 +02:00 committed by Mark Brown
parent 790b82898d
commit 2a8bd83af3
5 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/tegra/tegra_alc5632.c
View File

@ -124,18 +124,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int tegra_alc5632_card_remove(struct snd_soc_card *card)
{
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);
if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, 1,
&tegra_alc5632_hp_jack_gpio);
}
return 0;
}
static struct snd_soc_dai_link tegra_alc5632_dai = { static struct snd_soc_dai_link tegra_alc5632_dai = {
.name = "ALC5632", .name = "ALC5632",
.stream_name = "ALC5632 PCM", .stream_name = "ALC5632 PCM",
@ -150,7 +138,6 @@ static struct snd_soc_dai_link tegra_alc5632_dai = {
static struct snd_soc_card snd_soc_tegra_alc5632 = { static struct snd_soc_card snd_soc_tegra_alc5632 = {
.name = "tegra-alc5632", .name = "tegra-alc5632",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = tegra_alc5632_card_remove,
.dai_link = &tegra_alc5632_dai, .dai_link = &tegra_alc5632_dai,
.num_links = 1, .num_links = 1,
.controls = tegra_alc5632_controls, .controls = tegra_alc5632_controls,

18
sound/soc/tegra/tegra_max98090.c
View File

@ -176,23 +176,6 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int tegra_max98090_card_remove(struct snd_soc_card *card)
{
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);
if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
&tegra_max98090_hp_jack_gpio);
}
if (gpio_is_valid(machine->gpio_mic_det)) {
snd_soc_jack_free_gpios(&tegra_max98090_mic_jack, 1,
&tegra_max98090_mic_jack_gpio);
}
return 0;
}
static struct snd_soc_dai_link tegra_max98090_dai = { static struct snd_soc_dai_link tegra_max98090_dai = {
.name = "max98090", .name = "max98090",
.stream_name = "max98090 PCM", .stream_name = "max98090 PCM",
@ -206,7 +189,6 @@ static struct snd_soc_dai_link tegra_max98090_dai = {
static struct snd_soc_card snd_soc_tegra_max98090 = { static struct snd_soc_card snd_soc_tegra_max98090 = {
.name = "tegra-max98090", .name = "tegra-max98090",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = tegra_max98090_card_remove,
.dai_link = &tegra_max98090_dai, .dai_link = &tegra_max98090_dai,
.num_links = 1, .num_links = 1,
.controls = tegra_max98090_controls, .controls = tegra_max98090_controls,

13
sound/soc/tegra/tegra_rt5640.c
View File

@ -126,18 +126,6 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int tegra_rt5640_card_remove(struct snd_soc_card *card)
{
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);
if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
&tegra_rt5640_hp_jack_gpio);
}
return 0;
}
static struct snd_soc_dai_link tegra_rt5640_dai = { static struct snd_soc_dai_link tegra_rt5640_dai = {
.name = "RT5640", .name = "RT5640",
.stream_name = "RT5640 PCM", .stream_name = "RT5640 PCM",
@ -151,7 +139,6 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
static struct snd_soc_card snd_soc_tegra_rt5640 = { static struct snd_soc_card snd_soc_tegra_rt5640 = {
.name = "tegra-rt5640", .name = "tegra-rt5640",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = tegra_rt5640_card_remove,
.dai_link = &tegra_rt5640_dai, .dai_link = &tegra_rt5640_dai,
.num_links = 1, .num_links = 1,
.controls = tegra_rt5640_controls, .controls = tegra_rt5640_controls,

18
sound/soc/tegra/tegra_rt5677.c
View File

@ -169,23 +169,6 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int tegra_rt5677_card_remove(struct snd_soc_card *card)
{
struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(card);
if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_rt5677_hp_jack, 1,
&tegra_rt5677_hp_jack_gpio);
}
if (gpio_is_valid(machine->gpio_mic_present)) {
snd_soc_jack_free_gpios(&tegra_rt5677_mic_jack, 1,
&tegra_rt5677_mic_jack_gpio);
}
return 0;
}
static struct snd_soc_dai_link tegra_rt5677_dai = { static struct snd_soc_dai_link tegra_rt5677_dai = {
.name = "RT5677", .name = "RT5677",
.stream_name = "RT5677 PCM", .stream_name = "RT5677 PCM",
@ -199,7 +182,6 @@ static struct snd_soc_dai_link tegra_rt5677_dai = {
static struct snd_soc_card snd_soc_tegra_rt5677 = { static struct snd_soc_card snd_soc_tegra_rt5677 = {
.name = "tegra-rt5677", .name = "tegra-rt5677",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = tegra_rt5677_card_remove,
.dai_link = &tegra_rt5677_dai, .dai_link = &tegra_rt5677_dai,
.num_links = 1, .num_links = 1,
.controls = tegra_rt5677_controls, .controls = tegra_rt5677_controls,

5
sound/soc/tegra/tegra_wm8903.c
View File

@ -205,11 +205,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_codec *codec = codec_dai->codec;
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack, 1,
&tegra_wm8903_hp_jack_gpio);
}
wm8903_mic_detect(codec, NULL, 0, 0); wm8903_mic_detect(codec, NULL, 0, 0);
return 0; return 0;