diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2016-10-15 19:32:52 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-24 19:35:50 +0200 |
| commit | 0d895e14dff0af1838ca79a82f2c0cee7b8bf7ef (patch) | |
| tree | cf5a86cc0cb0a75dbe3d9d1d9cbdba1d5ea75f31 /sound/soc | |
| parent | ASoC: wm9712: Remove ac97_read/ac97_write wrappers (diff) | |
| download | linux-0d895e14dff0af1838ca79a82f2c0cee7b8bf7ef.tar.xz linux-0d895e14dff0af1838ca79a82f2c0cee7b8bf7ef.zip | |
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.
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/wm9712.h | 11 | ||||
| -rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/palm27x.c | 1 | ||||
| -rw-r--r-- | sound/soc/pxa/tosa.c | 1 |
6 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 20b2e8216336..5ed484eb47b2 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -22,7 +22,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 diff --git a/sound/soc/codecs/wm9712.h b/sound/soc/codecs/wm9712.h deleted file mode 100644 index fb69c3aa4ed0..000000000000 --- a/sound/soc/codecs/wm9712.h +++ /dev/null @@ -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 diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 41bf71466a7b..07b9c6e17df9 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c @@ -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, diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index 64743a05aeae..966163d1c813 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -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[] = { diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index bcc81e920a67..387492d46b6c 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c @@ -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; diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index c508f024ecfb..daed981f02dd 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -31,7 +31,6 @@ #include <mach/tosa.h> #include <mach/audio.h> -#include "../codecs/wm9712.h" #include "pxa2xx-ac97.h" #define TOSA_HP 0 |