diff options
author | Axel Lin <axel.lin@ingics.com> | 2015-09-24 11:34:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-24 13:30:47 -0400 |
commit | 0f7e17740612ca0f3b8baf91645075d07bb52b2c (patch) | |
tree | 294ff4536fe7b7662c1f5b50806caf1dbdd7e919 | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) |
ASoC: rl6347a: Clean up unneeded inclusion of header files
Also move the include of sound/hda_verbs.h to rl6347a.h because it is used
in rl6347a.h.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/rl6347a.c | 19 | ||||
-rw-r--r-- | sound/soc/codecs/rl6347a.h | 2 | ||||
-rw-r--r-- | sound/soc/codecs/rt286.c | 1 | ||||
-rw-r--r-- | sound/soc/codecs/rt298.c | 1 |
4 files changed, 3 insertions, 20 deletions
diff --git a/sound/soc/codecs/rl6347a.c b/sound/soc/codecs/rl6347a.c index 91d5166bd3a1..a4b910efbd45 100644 --- a/sound/soc/codecs/rl6347a.c +++ b/sound/soc/codecs/rl6347a.c | |||
@@ -11,25 +11,8 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/moduleparam.h> | ||
15 | #include <linux/init.h> | ||
16 | #include <linux/delay.h> | ||
17 | #include <linux/pm.h> | ||
18 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
19 | #include <linux/platform_device.h> | 15 | #include <linux/regmap.h> |
20 | #include <linux/spi/spi.h> | ||
21 | #include <linux/dmi.h> | ||
22 | #include <linux/acpi.h> | ||
23 | #include <sound/core.h> | ||
24 | #include <sound/pcm.h> | ||
25 | #include <sound/pcm_params.h> | ||
26 | #include <sound/soc.h> | ||
27 | #include <sound/soc-dapm.h> | ||
28 | #include <sound/initval.h> | ||
29 | #include <sound/tlv.h> | ||
30 | #include <sound/jack.h> | ||
31 | #include <linux/workqueue.h> | ||
32 | #include <sound/hda_verbs.h> | ||
33 | 16 | ||
34 | #include "rl6347a.h" | 17 | #include "rl6347a.h" |
35 | 18 | ||
diff --git a/sound/soc/codecs/rl6347a.h b/sound/soc/codecs/rl6347a.h index 1cb56e50b7f3..e127919cb36b 100644 --- a/sound/soc/codecs/rl6347a.h +++ b/sound/soc/codecs/rl6347a.h | |||
@@ -12,6 +12,8 @@ | |||
12 | #ifndef __RL6347A_H__ | 12 | #ifndef __RL6347A_H__ |
13 | #define __RL6347A_H__ | 13 | #define __RL6347A_H__ |
14 | 14 | ||
15 | #include <sound/hda_verbs.h> | ||
16 | |||
15 | #define VERB_CMD(V, N, D) ((N << 20) | (V << 8) | D) | 17 | #define VERB_CMD(V, N, D) ((N << 20) | (V << 8) | D) |
16 | 18 | ||
17 | #define RL6347A_VENDOR_REGISTERS 0x20 | 19 | #define RL6347A_VENDOR_REGISTERS 0x20 |
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index bd9365885f73..1fbdb4fe0ca9 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <sound/jack.h> | 29 | #include <sound/jack.h> |
30 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
31 | #include <sound/rt286.h> | 31 | #include <sound/rt286.h> |
32 | #include <sound/hda_verbs.h> | ||
33 | 32 | ||
34 | #include "rl6347a.h" | 33 | #include "rl6347a.h" |
35 | #include "rt286.h" | 34 | #include "rt286.h" |
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 3c2f0f8d6266..2a6c2ba0f0d8 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <sound/jack.h> | 28 | #include <sound/jack.h> |
29 | #include <linux/workqueue.h> | 29 | #include <linux/workqueue.h> |
30 | #include <sound/rt298.h> | 30 | #include <sound/rt298.h> |
31 | #include <sound/hda_verbs.h> | ||
32 | 31 | ||
33 | #include "rl6347a.h" | 32 | #include "rl6347a.h" |
34 | #include "rt298.h" | 33 | #include "rt298.h" |