Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d895e14 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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
f0fba2ad ("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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7e845e76

sound/soc/codecs/wm9712.c

+0 −1
Original line number Diff line number Diff line
@@ -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

sound/soc/codecs/wm9712.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/*

 * 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;