ASoC: wm9705: Remove unused DAI ID defines
Subsystems (4)
PATCH 1/7 ASoC: wm9705: Remove unused DAI ID defines
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
This also means the wm9705.h file no longer has any content and can be removed.
--- sound/soc/codecs/wm9705.c | 2 -- sound/soc/codecs/wm9705.h | 11 ----------- sound/soc/pxa/e740_wm9705.c | 1 - sound/soc/pxa/e750_wm9705.c | 1 - 4 files changed, 15 deletions(-) delete mode 100644 sound/soc/codecs/wm9705.h
sound/soc/codecs/wm9705.c +0 -2
@@ -20,8 +20,6 @@#include <sound/initval.h> #include <sound/soc.h> -#include "wm9705.h" -#define WM9705_VENDOR_ID 0x574d4c05#define WM9705_VENDOR_ID_MASK 0xffffffff
sound/soc/codecs/wm9705.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* -* wm9705.h -- WM9705 Soc Audio driver -*/ - -#ifndef _WM9705_H -#define _WM9705_H - -#define WM9705_DAI_AC97_HIFI 0 -#define WM9705_DAI_AC97_AUX 1 - -#endif
sound/soc/pxa/e740_wm9705.c +0 -1
@@ -22,7 +22,6 @@#include <asm/mach-types.h> -#include "../codecs/wm9705.h" #include "pxa2xx-ac97.h"
sound/soc/pxa/e750_wm9705.c +0 -1
@@ -22,7 +22,6 @@#include <asm/mach-types.h> -#include "../codecs/wm9705.h" #include "pxa2xx-ac97.h" static int e750_spk_amp_event(struct snd_soc_dapm_widget *w,
Signature · 1 line
2.1.4
PATCH 2/7 ASoC: wm9712: Remove unused DAI ID defines
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
This also means the wm9712.h file no longer has any content and can be removed.
--- sound/soc/codecs/wm9712.c | 1 - sound/soc/codecs/wm9712.h | 11 ----------- sound/soc/pxa/e800_wm9712.c | 1 - sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/palm27x.c | 1 - sound/soc/pxa/tosa.c | 1 - 6 files changed, 16 deletions(-) delete mode 100644 sound/soc/codecs/wm9712.h
sound/soc/codecs/wm9712.c +0 -1
@@ -21,7 +21,6 @@#include <sound/initval.h> #include <sound/soc.h> #include <sound/tlv.h> -#include "wm9712.h" #define WM9712_VENDOR_ID 0x574d4c12#define WM9712_VENDOR_ID_MASK 0xffffffff
sound/soc/codecs/wm9712.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* -* wm9712.h -- WM9712 Soc Audio driver -*/ - -#ifndef _WM9712_H -#define _WM9712_H - -#define WM9712_DAI_AC97_HIFI 0 -#define WM9712_DAI_AC97_AUX 1 - -#endif
sound/soc/pxa/e800_wm9712.c +0 -1
@@ -21,7 +21,6 @@#include <mach/audio.h> #include <mach/eseries-gpio.h> -#include "../codecs/wm9712.h" #include "pxa2xx-ac97.h" static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,
sound/soc/pxa/em-x270.c +0 -1
@@ -30,7 +30,6 @@#include <asm/mach-types.h> #include <mach/audio.h> -#include "../codecs/wm9712.h" #include "pxa2xx-ac97.h" static struct snd_soc_dai_link em_x270_dai[] = {
sound/soc/pxa/palm27x.c +0 -1
@@ -27,7 +27,6 @@#include <mach/audio.h> #include <linux/platform_data/asoc-palm27x.h> -#include "../codecs/wm9712.h" #include "pxa2xx-ac97.h" static struct snd_soc_jack hs_jack;
sound/soc/pxa/tosa.c +0 -1
@@ -31,7 +31,6 @@#include <mach/tosa.h> #include <mach/audio.h> -#include "../codecs/wm9712.h" #include "pxa2xx-ac97.h" #define TOSA_HP 0
Signature · 1 line
2.1.4
Re: [PATCH 2/7] ASoC: wm9712: Remove unused DAI ID defines
Quoted 11 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit
f0fba2ad1b6b("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.This also means the
wm9712.hfile no longer has any content and can be removed.Signed-off-by Lars-Peter Clausen <[email protected]>---
Thanks,
Charles
PATCH 3/7 ASoC: wm9713: Remove unused DAI ID defines
In reply to Lars-Peter ClausenThe DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
--- sound/soc/codecs/wm9713.h | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/codecs/wm9713.h +0 -4
@@ -41,8 +41,4 @@#define WM9713_PCMBCLK_DIV_8 (3 << 9)#define WM9713_PCMBCLK_DIV_16 (4 << 9) -#define WM9713_DAI_AC97_HIFI 0 -#define WM9713_DAI_AC97_AUX 1 -#define WM9713_DAI_PCM_VOICE 2 -#endif
Signature · 1 line
2.1.4
Re: [PATCH 3/7] ASoC: wm9713: Remove unused DAI ID defines
Quoted 8 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit
f0fba2ad1b6b("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.Signed-off-by Lars-Peter Clausen <[email protected]>---
Thanks,
Charles
PATCH 4/7 ASoC: wm8753: Remove unused DAI ID defines
In reply to Lars-Peter ClausenThe DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. These particular IDs were never used and presumably never will be, so remove them.
--- sound/soc/codecs/wm8753.h | 3 --- 1 file changed, 3 deletions(-)
sound/soc/codecs/wm8753.h +0 -3
@@ -112,7 +112,4 @@#define WM8753_VXCLK_DIV_8 (3 << 6)#define WM8753_VXCLK_DIV_16 (4 << 6) -#define WM8753_DAI_HIFI 0 -#define WM8753_DAI_VOICE 1 -#endif
Signature · 1 line
2.1.4
Re: [PATCH 4/7] ASoC: wm8753: Remove unused DAI ID defines
Quoted 7 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. These particular IDs were never used and presumably never will be, so remove them.
Signed-off-by Lars-Peter Clausen <[email protected]>---
Thanks,
Charles
PATCH 5/7 ASoC: pxa2xx-ac97: Remove unused DAI ID defines
In reply to Lars-Peter ClausenThe DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
This also means the pxa2xx-ac97.h file no longer has any content and can be removed.
--- sound/soc/pxa/e740_wm9705.c | 3 --- sound/soc/pxa/e750_wm9705.c | 2 -- sound/soc/pxa/e800_wm9712.c | 2 -- sound/soc/pxa/em-x270.c | 2 -- sound/soc/pxa/mioa701_wm9713.c | 1 - sound/soc/pxa/palm27x.c | 2 -- sound/soc/pxa/pxa2xx-ac97.c | 2 -- sound/soc/pxa/pxa2xx-ac97.h | 17 ----------------- sound/soc/pxa/tosa.c | 2 -- sound/soc/pxa/zylonite.c | 1 - 10 files changed, 34 deletions(-) delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h
sound/soc/pxa/e740_wm9705.c +0 -3
@@ -22,9 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" - -#define E740_AUDIO_OUT 1#define E740_AUDIO_IN 2
sound/soc/pxa/e750_wm9705.c +0 -2
@@ -22,8 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" -static int e750_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/e800_wm9712.c +0 -2
@@ -21,8 +21,6 @@#include <mach/audio.h> #include <mach/eseries-gpio.h> -#include "pxa2xx-ac97.h" -static int e800_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/em-x270.c +0 -2
@@ -30,8 +30,6 @@#include <asm/mach-types.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_dai_link em_x270_dai[] = { { .name ="AC97" ,
sound/soc/pxa/mioa701_wm9713.c +0 -1
@@ -53,7 +53,6 @@#include <sound/initval.h> #include <sound/ac97_codec.h> -#include "pxa2xx-ac97.h" #include "../codecs/wm9713.h" #define AC97_GPIO_PULL 0x58
sound/soc/pxa/palm27x.c +0 -2
@@ -27,8 +27,6 @@#include <mach/audio.h> #include <linux/platform_data/asoc-palm27x.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_jack hs_jack;/* Headphones jack detection DAPM pins */
sound/soc/pxa/pxa2xx-ac97.c +0 -2
@@ -27,8 +27,6 @@#include <mach/regs-ac97.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static void pxa2xx_ac97_warm_reset (struct snd_ac97 *ac97) {pxa2xx_ac97_try_warm_reset (ac97);
sound/soc/pxa/pxa2xx-ac97.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* linux/sound/soc/pxa/pxa2xx-ac97.h -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef _PXA2XX_AC97_H -#define _PXA2XX_AC97_H - -/* pxa2xx DAI ID's */ -#define PXA2XX_DAI_AC97_HIFI 0 -#define PXA2XX_DAI_AC97_AUX 1 -#define PXA2XX_DAI_AC97_MIC 2 - -#endif
sound/soc/pxa/tosa.c +0 -2
@@ -31,8 +31,6 @@#include <mach/tosa.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -#define TOSA_HP 0#define TOSA_MIC_INT 1#define TOSA_HEADSET 2
sound/soc/pxa/zylonite.c +0 -1
@@ -22,7 +22,6 @@#include <sound/soc.h> #include "../codecs/wm9713.h" -#include "pxa2xx-ac97.h" #include "pxa-ssp.h" /*
Signature · 1 line
2.1.4
Re: [PATCH 5/7] ASoC: pxa2xx-ac97: Remove unused DAI ID defines
Quoted 10 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit
f0fba2ad1b6b("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.This also means the
pxa2xx-ac97.hfile no longer has any content and can be removed.Signed-off-by Lars-Peter Clausen <[email protected]>
For pxa related files:
And with mioa701_wm9713.c:
Cheers.
--
Robert
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 5/7] ASoC: pxa2xx-ac97: Remove unused DAI ID defines
Quoted 8 lines · Mark Brown
Quoted 5 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit
f0fba2ad1b6b("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.This doesn't apply against current code, please check and resend.
It depends on the other earlier patches in this series. But I'll resend after the next merge window, this is not urgent.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 5/7] ASoC: pxa2xx-ac97: Remove unused DAI ID defines
Quoted 9 lines · Mark Brown
Quoted 6 lines · Lars-Peter Clausen
Quoted 1 line · Mark Brown
This doesn't apply against current code, please check and resend.
It depends on the other earlier patches in this series. But I'll resend after the next merge window, this is not urgent.
Ugh, which breaks because they got applied on topic branches :/
Yeah, it has been like this for a few years now, it can wait another 6 weeks.
Mark Brown
maintainerApplied "ASoC: pxa2xx-ac97: Remove unused DAI ID defines" to the asoc tree
In reply to Lars-Peter ClausenThe patch
ASoC: pxa2xx-ac97: Remove unused DAI ID defines
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
80691c8f08b3b516df8833817dfdf15cfa1b9067Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <[email protected]>
Date: Thu, 5 Jan 2017 13:07:27 +0100
Subject: [PATCH] ASoC: pxa2xx-ac97: Remove unused DAI ID defines
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
This also means the pxa2xx-ac97.h file no longer has any content and can be removed.
--- sound/soc/pxa/e740_wm9705.c | 3 --- sound/soc/pxa/e750_wm9705.c | 2 -- sound/soc/pxa/e800_wm9712.c | 2 -- sound/soc/pxa/em-x270.c | 2 -- sound/soc/pxa/mioa701_wm9713.c | 1 - sound/soc/pxa/palm27x.c | 2 -- sound/soc/pxa/pxa2xx-ac97.c | 2 -- sound/soc/pxa/pxa2xx-ac97.h | 17 ----------------- sound/soc/pxa/tosa.c | 2 -- sound/soc/pxa/zylonite.c | 1 - 10 files changed, 34 deletions(-) delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h
sound/soc/pxa/e740_wm9705.c +0 -3
@@ -22,9 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" - -#define E740_AUDIO_OUT 1#define E740_AUDIO_IN 2
sound/soc/pxa/e750_wm9705.c +0 -2
@@ -22,8 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" -static int e750_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/e800_wm9712.c +0 -2
@@ -21,8 +21,6 @@#include <mach/audio.h> #include <mach/eseries-gpio.h> -#include "pxa2xx-ac97.h" -static int e800_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/em-x270.c +0 -2
@@ -30,8 +30,6 @@#include <asm/mach-types.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_dai_link em_x270_dai[] = { { .name ="AC97" ,
sound/soc/pxa/mioa701_wm9713.c +0 -1
@@ -53,7 +53,6 @@#include <sound/initval.h> #include <sound/ac97_codec.h> -#include "pxa2xx-ac97.h" #include "../codecs/wm9713.h" #define AC97_GPIO_PULL 0x58
sound/soc/pxa/palm27x.c +0 -2
@@ -27,8 +27,6 @@#include <mach/audio.h> #include <linux/platform_data/asoc-palm27x.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_jack hs_jack;/* Headphones jack detection DAPM pins */
sound/soc/pxa/pxa2xx-ac97.c +0 -2
@@ -27,8 +27,6 @@#include <mach/regs-ac97.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static void pxa2xx_ac97_warm_reset (struct snd_ac97 *ac97) {pxa2xx_ac97_try_warm_reset (ac97);
sound/soc/pxa/pxa2xx-ac97.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* linux/sound/soc/pxa/pxa2xx-ac97.h -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef _PXA2XX_AC97_H -#define _PXA2XX_AC97_H - -/* pxa2xx DAI ID's */ -#define PXA2XX_DAI_AC97_HIFI 0 -#define PXA2XX_DAI_AC97_AUX 1 -#define PXA2XX_DAI_AC97_MIC 2 - -#endif
sound/soc/pxa/tosa.c +0 -2
@@ -31,8 +31,6 @@#include <mach/tosa.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -#define TOSA_HP 0#define TOSA_MIC_INT 1#define TOSA_HEADSET 2
sound/soc/pxa/zylonite.c +0 -1
@@ -22,7 +22,6 @@#include <sound/soc.h> #include "../codecs/wm9713.h" -#include "pxa2xx-ac97.h" #include "pxa-ssp.h" /*
Signature · 1 line
2.11.0
PATCH 6/7 ASoC: pxa2xx-i2s: Remove unused DAI ID defines
In reply to Lars-Peter ClausenThe DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. This particular ID was never used and presumably never will be, so remove it.
--- sound/soc/pxa/pxa2xx-i2s.h | 3 --- 1 file changed, 3 deletions(-)
sound/soc/pxa/pxa2xx-i2s.h +0 -3
@@ -9,9 +9,6 @@#ifndef _PXA2XX_I2S_H#define _PXA2XX_I2S_H -/* pxa2xx DAI ID's */ -#define PXA2XX_DAI_I2S 0 -/* I2S clock */ #define PXA2XX_I2S_SYSCLK 0
Signature · 1 line
2.1.4
PATCH 7/7 ASoC: pxa-ssp: Remove unused DAI ID defines
In reply to Lars-Peter ClausenThe DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.
--- sound/soc/pxa/pxa-ssp.h | 6 ------ 1 file changed, 6 deletions(-)
sound/soc/pxa/pxa-ssp.h +0 -6
@@ -9,12 +9,6 @@#ifndef _PXA_SSP_H#define _PXA_SSP_H -/* pxa DAI SSP IDs */ -#define PXA_DAI_SSP1 0 -#define PXA_DAI_SSP2 1 -#define PXA_DAI_SSP3 2 -#define PXA_DAI_SSP4 3 -/* SSP clock sources */ #define PXA_SSP_CLK_PLL 0#define PXA_SSP_CLK_EXT 1
Signature · 1 line
2.1.4
Quoted 11 lines · Lars-Peter Clausen
The DAI ID defines are back from the time when DAIs were referenced by a numerical ID. These days a string is used for matching instead and the defines are unused. The last user of these defines was removed in commit
f0fba2ad1b6b("ASoC: multi-component - ASoC Multi-Component Support"). So remove the defines as well.This also means the
wm9705.hfile no longer has any content and can be removed.Signed-off-by Lars-Peter Clausen <[email protected]>---
Thanks,
Charles