Skip to content

Commit

Permalink
ASoC: wm9712: Remove unused DAI ID defines
Browse files Browse the repository at this point in the history
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 <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
larsclausen authored and broonie committed Oct 24, 2016
1 parent 7e845e7 commit 0d895e1
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 16 deletions.
1 change: 0 additions & 1 deletion sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions sound/soc/codecs/wm9712.h

This file was deleted.

1 change: 0 additions & 1 deletion sound/soc/pxa/e800_wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion sound/soc/pxa/em-x270.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
1 change: 0 additions & 1 deletion sound/soc/pxa/palm27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion sound/soc/pxa/tosa.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <mach/tosa.h>
#include <mach/audio.h>

#include "../codecs/wm9712.h"
#include "pxa2xx-ac97.h"

#define TOSA_HP 0
Expand Down

0 comments on commit 0d895e1

Please sign in to comment.