ASoC: pxa2xx-ac97: Remove unused DAI ID defines
Subsystems (3)
PATCH 1/1 ASoC: pxa2xx-ac97: 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 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 pxa2xx-ac97.h file no longer has any content and can be removed.
Signed-off-by Lars-Peter Clausen <[email protected]>
Acked-by Robert Jarzmik <[email protected]>
--- sound/soc/pxa/e740_wm9705.c | 3 --- sound/soc/pxa/e750_wm9705.c | 2 -- sound/soc/pxa/e800_wm9712.c | 2 -- sound/soc/pxa/em-x270.c | 2 -- sound/soc/pxa/mioa701_wm9713.c | 1 - sound/soc/pxa/palm27x.c | 2 -- sound/soc/pxa/pxa2xx-ac97.c | 2 -- sound/soc/pxa/pxa2xx-ac97.h | 17 ----------------- sound/soc/pxa/tosa.c | 2 -- sound/soc/pxa/zylonite.c | 1 - 10 files changed, 34 deletions(-) delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h
sound/soc/pxa/e740_wm9705.c +0 -3
@@ -22,9 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" - -#define E740_AUDIO_OUT 1#define E740_AUDIO_IN 2
sound/soc/pxa/e750_wm9705.c +0 -2
@@ -22,8 +22,6 @@#include <asm/mach-types.h> -#include "pxa2xx-ac97.h" -static int e750_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/e800_wm9712.c +0 -2
@@ -21,8 +21,6 @@#include <mach/audio.h> #include <mach/eseries-gpio.h> -#include "pxa2xx-ac97.h" -static int e800_spk_amp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
sound/soc/pxa/em-x270.c +0 -2
@@ -30,8 +30,6 @@#include <asm/mach-types.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_dai_link em_x270_dai[] = { { .name ="AC97" ,
sound/soc/pxa/mioa701_wm9713.c +0 -1
@@ -53,7 +53,6 @@#include <sound/initval.h> #include <sound/ac97_codec.h> -#include "pxa2xx-ac97.h" #include "../codecs/wm9713.h" #define AC97_GPIO_PULL 0x58
sound/soc/pxa/palm27x.c +0 -2
@@ -27,8 +27,6 @@#include <mach/audio.h> #include <linux/platform_data/asoc-palm27x.h> -#include "pxa2xx-ac97.h" -static struct snd_soc_jack hs_jack;/* Headphones jack detection DAPM pins */
sound/soc/pxa/pxa2xx-ac97.c +0 -2
@@ -27,8 +27,6 @@#include <mach/regs-ac97.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -static void pxa2xx_ac97_warm_reset (struct snd_ac97 *ac97) {pxa2xx_ac97_try_warm_reset (ac97);
sound/soc/pxa/pxa2xx-ac97.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* -* linux/sound/soc/pxa/pxa2xx-ac97.h -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ - -#ifndef _PXA2XX_AC97_H -#define _PXA2XX_AC97_H - -/* pxa2xx DAI ID's */ -#define PXA2XX_DAI_AC97_HIFI 0 -#define PXA2XX_DAI_AC97_AUX 1 -#define PXA2XX_DAI_AC97_MIC 2 - -#endif
sound/soc/pxa/tosa.c +0 -2
@@ -31,8 +31,6 @@#include <mach/tosa.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" -#define TOSA_HP 0#define TOSA_MIC_INT 1#define TOSA_HEADSET 2
sound/soc/pxa/zylonite.c +0 -1
@@ -22,7 +22,6 @@#include <sound/soc.h> #include "../codecs/wm9713.h" -#include "pxa2xx-ac97.h" #include "pxa-ssp.h" /*
Signature · 1 line
2.1.4