Skip to content

Commit 0d895e1

Browse files
larsclausenbroonie
authored andcommitted
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 f0fba2a ("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 <[email protected]> Acked-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 7e845e7 commit 0d895e1

File tree

6 files changed

+0
-16
lines changed

6 files changed

+0
-16
lines changed

sound/soc/codecs/wm9712.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <sound/initval.h>
2323
#include <sound/soc.h>
2424
#include <sound/tlv.h>
25-
#include "wm9712.h"
2625

2726
#define WM9712_VENDOR_ID 0x574d4c12
2827
#define WM9712_VENDOR_ID_MASK 0xffffffff

sound/soc/codecs/wm9712.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

sound/soc/pxa/e800_wm9712.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <mach/audio.h>
2222
#include <mach/eseries-gpio.h>
2323

24-
#include "../codecs/wm9712.h"
2524
#include "pxa2xx-ac97.h"
2625

2726
static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,

sound/soc/pxa/em-x270.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <asm/mach-types.h>
3131
#include <mach/audio.h>
3232

33-
#include "../codecs/wm9712.h"
3433
#include "pxa2xx-ac97.h"
3534

3635
static struct snd_soc_dai_link em_x270_dai[] = {

sound/soc/pxa/palm27x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <mach/audio.h>
2828
#include <linux/platform_data/asoc-palm27x.h>
2929

30-
#include "../codecs/wm9712.h"
3130
#include "pxa2xx-ac97.h"
3231

3332
static struct snd_soc_jack hs_jack;

sound/soc/pxa/tosa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <mach/tosa.h>
3232
#include <mach/audio.h>
3333

34-
#include "../codecs/wm9712.h"
3534
#include "pxa2xx-ac97.h"
3635

3736
#define TOSA_HP 0

0 commit comments

Comments
 (0)