diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2016-10-15 19:32:51 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-24 18:37:15 +0100 |
| commit | d41a5b4a08607c4219654bbe9b382944cd92eec7 (patch) | |
| tree | 1fda89bd23ea89510f31a2ac09fea54d04ed7bd1 | |
| parent | 1457de3b8766045b815d1b37b7edc7b7c17c9dbc (diff) | |
| download | op-kernel-dev-d41a5b4a08607c4219654bbe9b382944cd92eec7.zip op-kernel-dev-d41a5b4a08607c4219654bbe9b382944cd92eec7.tar.gz | |
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.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/wm9705.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm9705.h | 11 | ||||
| -rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 1 |
4 files changed, 0 insertions, 15 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index e73ff61..f6d5c0f 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -21,8 +21,6 @@ #include <sound/initval.h> #include <sound/soc.h> -#include "wm9705.h" - #define WM9705_VENDOR_ID 0x574d4c05 #define WM9705_VENDOR_ID_MASK 0xffffffff diff --git a/sound/soc/codecs/wm9705.h b/sound/soc/codecs/wm9705.h deleted file mode 100644 index 23ea9ce..0000000 --- a/sound/soc/codecs/wm9705.h +++ /dev/null @@ -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 diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 1de8765..086c37a 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c @@ -22,7 +22,6 @@ #include <asm/mach-types.h> -#include "../codecs/wm9705.h" #include "pxa2xx-ac97.h" diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index b7eb7cd..7823278 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c @@ -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, |
