Commit 80691c8f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

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 f0fba2ad
("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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> (for mioa701_wm9713)
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "pxa2xx-ac97.h"
#define E740_AUDIO_OUT 1 #define E740_AUDIO_OUT 1
#define E740_AUDIO_IN 2 #define E740_AUDIO_IN 2
......
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "pxa2xx-ac97.h"
static int e750_spk_amp_event(struct snd_soc_dapm_widget *w, static int e750_spk_amp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
......
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include <mach/audio.h> #include <mach/audio.h>
#include <mach/eseries-gpio.h> #include <mach/eseries-gpio.h>
#include "pxa2xx-ac97.h"
static int e800_spk_amp_event(struct snd_soc_dapm_widget *w, static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
......
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/audio.h> #include <mach/audio.h>
#include "pxa2xx-ac97.h"
static struct snd_soc_dai_link em_x270_dai[] = { static struct snd_soc_dai_link em_x270_dai[] = {
{ {
.name = "AC97", .name = "AC97",
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/ac97_codec.h> #include <sound/ac97_codec.h>
#include "pxa2xx-ac97.h"
#include "../codecs/wm9713.h" #include "../codecs/wm9713.h"
#define AC97_GPIO_PULL 0x58 #define AC97_GPIO_PULL 0x58
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <mach/audio.h> #include <mach/audio.h>
#include <linux/platform_data/asoc-palm27x.h> #include <linux/platform_data/asoc-palm27x.h>
#include "pxa2xx-ac97.h"
static struct snd_soc_jack hs_jack; static struct snd_soc_jack hs_jack;
/* Headphones jack detection DAPM pins */ /* Headphones jack detection DAPM pins */
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <mach/regs-ac97.h> #include <mach/regs-ac97.h>
#include <mach/audio.h> #include <mach/audio.h>
#include "pxa2xx-ac97.h"
static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97) static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97)
{ {
pxa2xx_ac97_try_warm_reset(ac97); pxa2xx_ac97_try_warm_reset(ac97);
......
/*
* 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
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
#include <mach/tosa.h> #include <mach/tosa.h>
#include <mach/audio.h> #include <mach/audio.h>
#include "pxa2xx-ac97.h"
#define TOSA_HP 0 #define TOSA_HP 0
#define TOSA_MIC_INT 1 #define TOSA_MIC_INT 1
#define TOSA_HEADSET 2 #define TOSA_HEADSET 2
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <sound/soc.h> #include <sound/soc.h>
#include "../codecs/wm9713.h" #include "../codecs/wm9713.h"
#include "pxa2xx-ac97.h"
#include "pxa-ssp.h" #include "pxa-ssp.h"
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment