ASoC: jack: Manage gpios via devres
Subsystems (9)
cover ASoC: jack: Manage gpios via devres
Hi,
while debugging the recent GPIO regression with (still not-merged) cx2072x codec driver, I noticed the driver misses the snd_soc_jack_free_gpios() call.
This patch set is rather making it redundant, change the ASoC jack code to manage gpios via devres. It follows the cleanups of superfluous snd_soc_jack_free_gpios() in each driver. This resulted in lots of reductions of remove callbacks.
Takashi
===
Takashi Iwai (8):
ASoC: jack: Manage gpios via devres
ASoC: fsl: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: intel: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: omap: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: pxa: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: samsung: Remove superfluous snd_soc_jack_free_gpios() call
ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call
sound/soc/fsl/imx-es8328.c | 3 -- sound/soc/generic/simple-card.c | 10 ------- sound/soc/intel/boards/byt-max98090.c | 12 -------- sound/soc/omap/ams-delta.c | 10 ------- sound/soc/omap/omap-twl4030.c | 13 --------- sound/soc/omap/rx51.c | 9 ------ sound/soc/pxa/hx4700.c | 8 ------ sound/soc/samsung/h1940_uda1380.c | 9 ------ sound/soc/samsung/rx1950_uda1380.c | 10 ------- sound/soc/samsung/smartq_wm8987.c | 9 ------ sound/soc/soc-jack.c | 52 +++++++++++++++++++++++++++-------- sound/soc/tegra/tegra_alc5632.c | 13 --------- sound/soc/tegra/tegra_max98090.c | 18 ------------ sound/soc/tegra/tegra_rt5640.c | 13 --------- sound/soc/tegra/tegra_rt5677.c | 18 ------------ sound/soc/tegra/tegra_wm8903.c | 5 ---- 16 files changed, 41 insertions(+), 171 deletions(-)
Signature · 1 line
2.14.0
PATCH 1/8 ASoC: jack: Manage gpios via devres
Let's be lazy -- this patch adds the devres code to snd_soc_jack_add_gpios() for releasing the gpio resources at device removal automagically. After this patch, you don't have to call snd_soc_jack_free_gpios() manually as long as it's managed from the machine driver.
What about the gpios assigned in other levels? Well, you might still need to free the resources manually, depending on how the component unbind works.
--- sound/soc/soc-jack.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-)
sound/soc/soc-jack.c +41 -11
@@ -22,6 +22,12 @@#include <linux/suspend.h> #include <trace/events/asoc.h> +struct jack_gpio_tbl { +int count; +struct snd_soc_jack *jack; +struct snd_soc_jack_gpio *gpios; +}; +/** * snd_soc_codec_set_jack - configure codec jack. * @codec: CODEC
@@ -333,6 +339,28 @@ static int snd_soc_jack_pm_notifier(struct notifier_block *nb,return NOTIFY_DONE ; } +static void jack_free_gpios (struct snd_soc_jack *jack,int count, +struct snd_soc_jack_gpio *gpios) +{ +int i; + +for (i =0 ; i < count; i++) { +gpiod_unexport (gpios[i].desc); +unregister_pm_notifier (&gpios[i].pm_notifier); +free_irq (gpiod_to_irq (gpios[i].desc), &gpios[i]); +cancel_delayed_work_sync (&gpios[i].work); +gpiod_put (gpios[i].desc); + gpios[i].jack =NULL ; + } +} + +static void jack_devres_free_gpios (struct device *dev,void *res) +{ +struct jack_gpio_tbl *tbl = res; + +jack_free_gpios (tbl->jack, tbl->count, tbl->gpios); +} +/** * snd_soc_jack_add_gpios - Associate GPIO pins with an ASoC jack *
@@ -347,6 +375,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, struct snd_soc_jack_gpio *gpios) {int i, ret; +struct jack_gpio_tbl *tbl; + + tbl =devres_alloc (jack_devres_free_gpios,sizeof (*tbl),GFP_KERNEL ); +if (!tbl) +return -ENOMEM ; + tbl->jack = jack; + tbl->count = count; + tbl->gpios = gpios;for (i =0 ; i < count; i++) {if (!gpios[i].name) {
@@ -424,12 +460,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, msecs_to_jiffies(gpios[i].debounce_time)); } +devres_add (jack->card->dev, tbl);return 0 ; err:gpio_free (gpios[i].gpio); undo: -snd_soc_jack_free_gpios (jack, i, gpios); +jack_free_gpios (jack, i, gpios); +devres_free (tbl);return ret; }
@@ -471,16 +509,8 @@ EXPORT_SYMBOL_GPL(snd_soc_jack_add_gpiods);void snd_soc_jack_free_gpios (struct snd_soc_jack *jack,int count,struct snd_soc_jack_gpio *gpios) { -int i; - -for (i =0 ; i < count; i++) { -gpiod_unexport (gpios[i].desc); -unregister_pm_notifier (&gpios[i].pm_notifier); -free_irq (gpiod_to_irq (gpios[i].desc), &gpios[i]); -cancel_delayed_work_sync (&gpios[i].work); -gpiod_put (gpios[i].desc); - gpios[i].jack =NULL ; - } +jack_free_gpios (jack, count, gpios); +devres_destroy (jack->card->dev, jack_devres_free_gpios,NULL ,NULL ); }EXPORT_SYMBOL_GPL (snd_soc_jack_free_gpios);#endif /* CONFIG_GPIOLIB */
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: jack: Manage gpios via devres" to the asoc tree
The patch
ASoC: jack: Manage gpios via devres
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
bd29ae969042c87413157c02d4f2a787d0212da3Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:44 +0200
Subject: [PATCH] ASoC: jack: Manage gpios via devres
Let's be lazy -- this patch adds the devres code to snd_soc_jack_add_gpios() for releasing the gpio resources at device removal automagically. After this patch, you don't have to call snd_soc_jack_free_gpios() manually as long as it's managed from the machine driver.
What about the gpios assigned in other levels? Well, you might still need to free the resources manually, depending on how the component unbind works.
--- sound/soc/soc-jack.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-)
sound/soc/soc-jack.c +41 -11
@@ -22,6 +22,12 @@#include <linux/suspend.h> #include <trace/events/asoc.h> +struct jack_gpio_tbl { +int count; +struct snd_soc_jack *jack; +struct snd_soc_jack_gpio *gpios; +}; +/** * snd_soc_codec_set_jack - configure codec jack. * @codec: CODEC
@@ -333,6 +339,28 @@ static int snd_soc_jack_pm_notifier(struct notifier_block *nb,return NOTIFY_DONE ; } +static void jack_free_gpios (struct snd_soc_jack *jack,int count, +struct snd_soc_jack_gpio *gpios) +{ +int i; + +for (i =0 ; i < count; i++) { +gpiod_unexport (gpios[i].desc); +unregister_pm_notifier (&gpios[i].pm_notifier); +free_irq (gpiod_to_irq (gpios[i].desc), &gpios[i]); +cancel_delayed_work_sync (&gpios[i].work); +gpiod_put (gpios[i].desc); + gpios[i].jack =NULL ; + } +} + +static void jack_devres_free_gpios (struct device *dev,void *res) +{ +struct jack_gpio_tbl *tbl = res; + +jack_free_gpios (tbl->jack, tbl->count, tbl->gpios); +} +/** * snd_soc_jack_add_gpios - Associate GPIO pins with an ASoC jack *
@@ -347,6 +375,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, struct snd_soc_jack_gpio *gpios) {int i, ret; +struct jack_gpio_tbl *tbl; + + tbl =devres_alloc (jack_devres_free_gpios,sizeof (*tbl),GFP_KERNEL ); +if (!tbl) +return -ENOMEM ; + tbl->jack = jack; + tbl->count = count; + tbl->gpios = gpios;for (i =0 ; i < count; i++) {if (!gpios[i].name) {
@@ -424,12 +460,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, msecs_to_jiffies(gpios[i].debounce_time)); } +devres_add (jack->card->dev, tbl);return 0 ; err:gpio_free (gpios[i].gpio); undo: -snd_soc_jack_free_gpios (jack, i, gpios); +jack_free_gpios (jack, i, gpios); +devres_free (tbl);return ret; }
@@ -471,16 +509,8 @@ EXPORT_SYMBOL_GPL(snd_soc_jack_add_gpiods);void snd_soc_jack_free_gpios (struct snd_soc_jack *jack,int count,struct snd_soc_jack_gpio *gpios) { -int i; - -for (i =0 ; i < count; i++) { -gpiod_unexport (gpios[i].desc); -unregister_pm_notifier (&gpios[i].pm_notifier); -free_irq (gpiod_to_irq (gpios[i].desc), &gpios[i]); -cancel_delayed_work_sync (&gpios[i].work); -gpiod_put (gpios[i].desc); - gpios[i].jack =NULL ; - } +jack_free_gpios (jack, count, gpios); +devres_destroy (jack->card->dev, jack_devres_free_gpios,NULL ,NULL ); }EXPORT_SYMBOL_GPL (snd_soc_jack_free_gpios);#endif /* CONFIG_GPIOLIB */
Signature · 1 line
2.13.2
PATCH 2/8 ASoC: fsl: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/fsl/imx-es8328.c | 3 --- 1 file changed, 3 deletions(-)
sound/soc/fsl/imx-es8328.c +0 -3
@@ -203,9 +203,6 @@ static int imx_es8328_remove(struct platform_device *pdev) {struct imx_es8328_data *data =platform_get_drvdata (pdev); -snd_soc_jack_free_gpios (&headset_jack,ARRAY_SIZE (headset_jack_gpios), - headset_jack_gpios); -snd_soc_unregister_card (&data->card);return 0 ;
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: fsl: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: fsl: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8244fd7e489a586e63a36302105a2a1ece28a3c6Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:45 +0200
Subject: [PATCH] ASoC: fsl: 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.
--- sound/soc/fsl/imx-es8328.c | 3 --- 1 file changed, 3 deletions(-)
sound/soc/fsl/imx-es8328.c +0 -3
@@ -203,9 +203,6 @@ static int imx_es8328_remove(struct platform_device *pdev) {struct imx_es8328_data *data =platform_get_drvdata (pdev); -snd_soc_jack_free_gpios (&headset_jack,ARRAY_SIZE (headset_jack_gpios), - headset_jack_gpios); -snd_soc_unregister_card (&data->card);return 0 ;
Signature · 1 line
2.13.2
PATCH 3/8 ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/generic/simple-card.c | 10 ---------- 1 file changed, 10 deletions(-)
sound/soc/generic/simple-card.c +0 -10
@@ -104,12 +104,6 @@ static int asoc_simple_card_init_jack(struct snd_soc_card *card,return 0 ; } -static void asoc_simple_card_remove_jack (struct asoc_simple_jack *sjack) -{ -if (gpio_is_valid (sjack->gpio.gpio)) -snd_soc_jack_free_gpios (&sjack->jack,1 , &sjack->gpio); -} -static int asoc_simple_card_startup (struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -493,10 +487,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)static int asoc_simple_card_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct simple_card_data *priv =snd_soc_card_get_drvdata (card); - -asoc_simple_card_remove_jack (&priv->hp_jack); -asoc_simple_card_remove_jack (&priv->mic_jack);return asoc_simple_card_clean_reference (card); }
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2661112fcc5fe555130f383a21e6ce5152570403Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:46 +0200
Subject: [PATCH] ASoC: simple-card: 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.
--- sound/soc/generic/simple-card.c | 10 ---------- 1 file changed, 10 deletions(-)
sound/soc/generic/simple-card.c +0 -10
@@ -104,12 +104,6 @@ static int asoc_simple_card_init_jack(struct snd_soc_card *card,return 0 ; } -static void asoc_simple_card_remove_jack (struct asoc_simple_jack *sjack) -{ -if (gpio_is_valid (sjack->gpio.gpio)) -snd_soc_jack_free_gpios (&sjack->jack,1 , &sjack->gpio); -} -static int asoc_simple_card_startup (struct snd_pcm_substream *substream) {struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -493,10 +487,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)static int asoc_simple_card_remove (struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -struct simple_card_data *priv =snd_soc_card_get_drvdata (card); - -asoc_simple_card_remove_jack (&priv->hp_jack); -asoc_simple_card_remove_jack (&priv->mic_jack);return asoc_simple_card_clean_reference (card); }
Signature · 1 line
2.13.2
PATCH 4/8 ASoC: intel: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/intel/boards/byt-max98090.c | 12 ------------ 1 file changed, 12 deletions(-)
sound/soc/intel/boards/byt-max98090.c +0 -12
@@ -173,20 +173,8 @@ static int byt_max98090_probe(struct platform_device *pdev)return 0 ; } -static int byt_max98090_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); -struct byt_max98090_private *priv =snd_soc_card_get_drvdata (card); - -snd_soc_jack_free_gpios (&priv->jack,ARRAY_SIZE (hs_jack_gpios), - hs_jack_gpios); - -return 0 ; -} -static struct platform_driver byt_max98090_driver = { .probe = byt_max98090_probe, - .remove = byt_max98090_remove, .driver = { .name ="byt-max98090" , .pm = &snd_soc_pm_ops,
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: intel: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: intel: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
51f25e7f9270378cee0526184ecaaae6c847a5f6Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:47 +0200
Subject: [PATCH] ASoC: intel: 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.
--- sound/soc/intel/boards/byt-max98090.c | 12 ------------ 1 file changed, 12 deletions(-)
sound/soc/intel/boards/byt-max98090.c +0 -12
@@ -173,20 +173,8 @@ static int byt_max98090_probe(struct platform_device *pdev)return 0 ; } -static int byt_max98090_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); -struct byt_max98090_private *priv =snd_soc_card_get_drvdata (card); - -snd_soc_jack_free_gpios (&priv->jack,ARRAY_SIZE (hs_jack_gpios), - hs_jack_gpios); - -return 0 ; -} -static struct platform_driver byt_max98090_driver = { .probe = byt_max98090_probe, - .remove = byt_max98090_remove, .driver = { .name ="byt-max98090" , .pm = &snd_soc_pm_ops,
Signature · 1 line
2.13.2
PATCH 5/8 ASoC: omap: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/omap/ams-delta.c | 10 ---------- sound/soc/omap/omap-twl4030.c | 13 ------------- sound/soc/omap/rx51.c | 9 --------- 3 files changed, 32 deletions(-)
sound/soc/omap/ams-delta.c +0 -10
@@ -513,15 +513,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)return 0 ; } -static int ams_delta_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&ams_delta_hook_switch, -ARRAY_SIZE (ams_delta_hook_switch_gpios), - ams_delta_hook_switch_gpios); - -return 0 ; -} -/* DAI glue - connects codec <--> CPU */ static struct snd_soc_dai_link ams_delta_dai_link = { .name ="CX20442" ,
@@ -540,7 +531,6 @@ static struct snd_soc_dai_link ams_delta_dai_link = {static struct snd_soc_card ams_delta_audio_card = { .name ="AMS_DELTA" , .owner =THIS_MODULE , - .remove = ams_delta_card_remove, .dai_link = &ams_delta_dai_link, .num_links =1 ,
sound/soc/omap/omap-twl4030.c +0 -13
@@ -208,18 +208,6 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)return ret; } -static int omap_twl4030_card_remove (struct snd_soc_card *card) -{ -struct omap_twl4030 *priv =snd_soc_card_get_drvdata (card); - -if (priv->jack_detect >0 ) -snd_soc_jack_free_gpios (&priv->hs_jack, -ARRAY_SIZE (hs_jack_gpios), - hs_jack_gpios); - -return 0 ; -} -/* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link omap_twl4030_dai_links[] = { {
@@ -247,7 +235,6 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {/* Audio machine driver */ static struct snd_soc_card omap_twl4030_card = { .owner =THIS_MODULE , - .remove = omap_twl4030_card_remove, .dai_link = omap_twl4030_dai_links, .num_links =ARRAY_SIZE (omap_twl4030_dai_links),
sound/soc/omap/rx51.c +0 -9
@@ -311,14 +311,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)return err; } -static int rx51_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&rx51_av_jack,ARRAY_SIZE (rx51_av_jack_gpios), - rx51_av_jack_gpios); - -return 0 ; -} -/* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link rx51_dai[] = { {
@@ -361,7 +353,6 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {static struct snd_soc_card rx51_sound_card = { .name ="RX-51" , .owner =THIS_MODULE , - .remove = rx51_card_remove, .dai_link = rx51_dai, .num_links =ARRAY_SIZE (rx51_dai), .aux_dev = rx51_aux_dev,
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: omap: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: omap: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
90c265c65a3216ea236ed8e81d0a8d6411c26e88Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:48 +0200
Subject: [PATCH] ASoC: omap: 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.
--- sound/soc/omap/ams-delta.c | 10 ---------- sound/soc/omap/omap-twl4030.c | 13 ------------- sound/soc/omap/rx51.c | 9 --------- 3 files changed, 32 deletions(-)
sound/soc/omap/ams-delta.c +0 -10
@@ -513,15 +513,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)return 0 ; } -static int ams_delta_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&ams_delta_hook_switch, -ARRAY_SIZE (ams_delta_hook_switch_gpios), - ams_delta_hook_switch_gpios); - -return 0 ; -} -/* DAI glue - connects codec <--> CPU */ static struct snd_soc_dai_link ams_delta_dai_link = { .name ="CX20442" ,
@@ -540,7 +531,6 @@ static struct snd_soc_dai_link ams_delta_dai_link = {static struct snd_soc_card ams_delta_audio_card = { .name ="AMS_DELTA" , .owner =THIS_MODULE , - .remove = ams_delta_card_remove, .dai_link = &ams_delta_dai_link, .num_links =1 ,
sound/soc/omap/omap-twl4030.c +0 -13
@@ -208,18 +208,6 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)return ret; } -static int omap_twl4030_card_remove (struct snd_soc_card *card) -{ -struct omap_twl4030 *priv =snd_soc_card_get_drvdata (card); - -if (priv->jack_detect >0 ) -snd_soc_jack_free_gpios (&priv->hs_jack, -ARRAY_SIZE (hs_jack_gpios), - hs_jack_gpios); - -return 0 ; -} -/* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link omap_twl4030_dai_links[] = { {
@@ -247,7 +235,6 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {/* Audio machine driver */ static struct snd_soc_card omap_twl4030_card = { .owner =THIS_MODULE , - .remove = omap_twl4030_card_remove, .dai_link = omap_twl4030_dai_links, .num_links =ARRAY_SIZE (omap_twl4030_dai_links),
sound/soc/omap/rx51.c +0 -9
@@ -311,14 +311,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)return err; } -static int rx51_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&rx51_av_jack,ARRAY_SIZE (rx51_av_jack_gpios), - rx51_av_jack_gpios); - -return 0 ; -} -/* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link rx51_dai[] = { {
@@ -361,7 +353,6 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {static struct snd_soc_card rx51_sound_card = { .name ="RX-51" , .owner =THIS_MODULE , - .remove = rx51_card_remove, .dai_link = rx51_dai, .num_links =ARRAY_SIZE (rx51_dai), .aux_dev = rx51_aux_dev,
Signature · 1 line
2.13.2
PATCH 6/8 ASoC: pxa: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/pxa/hx4700.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/pxa/hx4700.c +0 -8
@@ -138,13 +138,6 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)return err; } -static int hx4700_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&hs_jack,1 , &hs_jack_gpio); - -return 0 ; -} -/* hx4700 digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link hx4700_dai = { .name ="ak4641" ,
@@ -163,7 +156,6 @@ static struct snd_soc_dai_link hx4700_dai = {static struct snd_soc_card snd_soc_card_hx4700 = { .name ="iPAQ hx4700" , .owner =THIS_MODULE , - .remove = hx4700_card_remove, .dai_link = &hx4700_dai, .num_links =1 , .dapm_widgets = hx4700_dapm_widgets,
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: pxa: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: pxa: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
7676b40606666547544998e5bc9e7f492fa2e13fMon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:49 +0200
Subject: [PATCH] ASoC: pxa: 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.
--- sound/soc/pxa/hx4700.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/pxa/hx4700.c +0 -8
@@ -138,13 +138,6 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd)return err; } -static int hx4700_card_remove (struct snd_soc_card *card) -{ -snd_soc_jack_free_gpios (&hs_jack,1 , &hs_jack_gpio); - -return 0 ; -} -/* hx4700 digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link hx4700_dai = { .name ="ak4641" ,
@@ -163,7 +156,6 @@ static struct snd_soc_dai_link hx4700_dai = {static struct snd_soc_card snd_soc_card_hx4700 = { .name ="iPAQ hx4700" , .owner =THIS_MODULE , - .remove = hx4700_card_remove, .dai_link = &hx4700_dai, .num_links =1 , .dapm_widgets = hx4700_dapm_widgets,
Signature · 1 line
2.13.2
PATCH 7/8 ASoC: samsung: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/samsung/h1940_uda1380.c | 9 --------- sound/soc/samsung/rx1950_uda1380.c | 10 ---------- sound/soc/samsung/smartq_wm8987.c | 9 --------- 3 files changed, 28 deletions(-)
sound/soc/samsung/h1940_uda1380.c +0 -9
@@ -170,14 +170,6 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)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 */ 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 = { .name ="h1940" , .owner =THIS_MODULE , - .remove = h1940_uda1380_card_remove, .dai_link = h1940_uda1380_dai, .num_links =ARRAY_SIZE (h1940_uda1380_dai),
sound/soc/samsung/rx1950_uda1380.c +0 -10
@@ -31,7 +31,6 @@#include "s3c24xx-i2s.h" 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_hw_params (struct snd_pcm_substream *substream,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 = { .name ="rx1950" , .owner =THIS_MODULE , - .remove = rx1950_uda1380_card_remove, .dai_link = 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 ; } -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 ) {int ret;
sound/soc/samsung/smartq_wm8987.c +0 -9
@@ -160,14 +160,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)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[] = { { .name ="wm8987" ,
@@ -186,7 +178,6 @@ static struct snd_soc_dai_link smartq_dai[] = {static struct snd_soc_card snd_soc_smartq = { .name ="SmartQ" , .owner =THIS_MODULE , - .remove = smartq_wm8987_card_remove, .dai_link = smartq_dai, .num_links =ARRAY_SIZE (smartq_dai),
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: samsung: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: samsung: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
790b82898db2f42e3430ca84ac9bc3bd7ab474ceMon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:50 +0200
Subject: [PATCH] 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.
--- sound/soc/samsung/h1940_uda1380.c | 9 --------- sound/soc/samsung/rx1950_uda1380.c | 10 ---------- sound/soc/samsung/smartq_wm8987.c | 9 --------- 3 files changed, 28 deletions(-)
sound/soc/samsung/h1940_uda1380.c +0 -9
@@ -170,14 +170,6 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd)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 */ 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 = { .name ="h1940" , .owner =THIS_MODULE , - .remove = h1940_uda1380_card_remove, .dai_link = h1940_uda1380_dai, .num_links =ARRAY_SIZE (h1940_uda1380_dai),
sound/soc/samsung/rx1950_uda1380.c +0 -10
@@ -31,7 +31,6 @@#include "s3c24xx-i2s.h" 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_hw_params (struct snd_pcm_substream *substream,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 = { .name ="rx1950" , .owner =THIS_MODULE , - .remove = rx1950_uda1380_card_remove, .dai_link = 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 ; } -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 ) {int ret;
sound/soc/samsung/smartq_wm8987.c +0 -9
@@ -160,14 +160,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)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[] = { { .name ="wm8987" ,
@@ -186,7 +178,6 @@ static struct snd_soc_dai_link smartq_dai[] = {static struct snd_soc_card snd_soc_smartq = { .name ="SmartQ" , .owner =THIS_MODULE , - .remove = smartq_wm8987_card_remove, .dai_link = smartq_dai, .num_links =ARRAY_SIZE (smartq_dai),
Signature · 1 line
2.13.2
PATCH 8/8 ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call
In reply to Takashi IwaiSince jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer.
--- sound/soc/tegra/tegra_alc5632.c | 13 ------------- sound/soc/tegra/tegra_max98090.c | 18 ------------------ sound/soc/tegra/tegra_rt5640.c | 13 ------------- sound/soc/tegra/tegra_rt5677.c | 18 ------------------ sound/soc/tegra/tegra_wm8903.c | 5 ----- 5 files changed, 67 deletions(-)
sound/soc/tegra/tegra_alc5632.c +0 -13
@@ -124,18 +124,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="ALC5632" , .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 = { .name ="tegra-alc5632" , .owner =THIS_MODULE , - .remove = tegra_alc5632_card_remove, .dai_link = &tegra_alc5632_dai, .num_links =1 , .controls = tegra_alc5632_controls,
sound/soc/tegra/tegra_max98090.c +0 -18
@@ -176,23 +176,6 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="max98090" , .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 = { .name ="tegra-max98090" , .owner =THIS_MODULE , - .remove = tegra_max98090_card_remove, .dai_link = &tegra_max98090_dai, .num_links =1 , .controls = tegra_max98090_controls,
sound/soc/tegra/tegra_rt5640.c +0 -13
@@ -126,18 +126,6 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="RT5640" , .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 = { .name ="tegra-rt5640" , .owner =THIS_MODULE , - .remove = tegra_rt5640_card_remove, .dai_link = &tegra_rt5640_dai, .num_links =1 , .controls = tegra_rt5640_controls,
sound/soc/tegra/tegra_rt5677.c +0 -18
@@ -169,23 +169,6 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="RT5677" , .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 = { .name ="tegra-rt5677" , .owner =THIS_MODULE , - .remove = tegra_rt5677_card_remove, .dai_link = &tegra_rt5677_dai, .num_links =1 , .controls = tegra_rt5677_controls,
sound/soc/tegra/tegra_wm8903.c +0 -5
@@ -205,11 +205,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)struct snd_soc_codec *codec = codec_dai->codec;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 );return 0 ;
Signature · 1 line
2.14.0
Mark Brown
maintainerApplied "ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree
The patch
ASoC: tegra: Remove superfluous snd_soc_jack_free_gpios() call
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
2a8bd83af30e3045b8b251191e759a2be9877816Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 22 Aug 2017 13:59:51 +0200
Subject: [PATCH] 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.
--- sound/soc/tegra/tegra_alc5632.c | 13 ------------- sound/soc/tegra/tegra_max98090.c | 18 ------------------ sound/soc/tegra/tegra_rt5640.c | 13 ------------- sound/soc/tegra/tegra_rt5677.c | 18 ------------------ sound/soc/tegra/tegra_wm8903.c | 5 ----- 5 files changed, 67 deletions(-)
sound/soc/tegra/tegra_alc5632.c +0 -13
@@ -124,18 +124,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="ALC5632" , .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 = { .name ="tegra-alc5632" , .owner =THIS_MODULE , - .remove = tegra_alc5632_card_remove, .dai_link = &tegra_alc5632_dai, .num_links =1 , .controls = tegra_alc5632_controls,
sound/soc/tegra/tegra_max98090.c +0 -18
@@ -176,23 +176,6 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="max98090" , .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 = { .name ="tegra-max98090" , .owner =THIS_MODULE , - .remove = tegra_max98090_card_remove, .dai_link = &tegra_max98090_dai, .num_links =1 , .controls = tegra_max98090_controls,
sound/soc/tegra/tegra_rt5640.c +0 -13
@@ -126,18 +126,6 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="RT5640" , .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 = { .name ="tegra-rt5640" , .owner =THIS_MODULE , - .remove = tegra_rt5640_card_remove, .dai_link = &tegra_rt5640_dai, .num_links =1 , .controls = tegra_rt5640_controls,
sound/soc/tegra/tegra_rt5677.c +0 -18
@@ -169,23 +169,6 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)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 = { .name ="RT5677" , .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 = { .name ="tegra-rt5677" , .owner =THIS_MODULE , - .remove = tegra_rt5677_card_remove, .dai_link = &tegra_rt5677_dai, .num_links =1 , .controls = tegra_rt5677_controls,
sound/soc/tegra/tegra_wm8903.c +0 -5
@@ -205,11 +205,6 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)struct snd_soc_codec *codec = codec_dai->codec;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 );return 0 ;
Signature · 1 line
2.13.2