Skip to content

Commit 3249c68

Browse files
andy-shevbroonie
authored andcommitted
ASoC: soc.h: Don't use "proxy" headers
Update header inclusions to follow IWYU (Include What You Use) principle. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20240422151513.2052167-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 710f9a3 commit 3249c68

1 file changed

Lines changed: 20 additions & 10 deletions

File tree

include/sound/soc.h

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,30 @@
1111
#define __LINUX_SND_SOC_H
1212

1313
#include <linux/args.h>
14+
#include <linux/array_size.h>
15+
#include <linux/device.h>
16+
#include <linux/errno.h>
17+
#include <linux/interrupt.h>
18+
#include <linux/lockdep.h>
19+
#include <linux/log2.h>
20+
#include <linux/mutex.h>
21+
#include <linux/notifier.h>
1422
#include <linux/of.h>
15-
#include <linux/platform_device.h>
1623
#include <linux/types.h>
17-
#include <linux/notifier.h>
1824
#include <linux/workqueue.h>
19-
#include <linux/interrupt.h>
20-
#include <linux/kernel.h>
21-
#include <linux/regmap.h>
22-
#include <linux/log2.h>
23-
#include <sound/core.h>
24-
#include <sound/pcm.h>
25+
26+
#include <sound/ac97_codec.h>
2527
#include <sound/compress_driver.h>
2628
#include <sound/control.h>
27-
#include <sound/ac97_codec.h>
29+
#include <sound/core.h>
30+
#include <sound/pcm.h>
31+
32+
struct module;
33+
struct platform_device;
34+
35+
/* For the current users of sound/soc.h to avoid build issues */
36+
#include <linux/platform_device.h>
37+
#include <linux/regmap.h>
2838

2939
/*
3040
* Convenience kcontrol builders
@@ -412,7 +422,6 @@
412422
#define SOC_ENUM_SINGLE_VIRT_DECL(name, xtexts) \
413423
const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)
414424

415-
struct device_node;
416425
struct snd_jack;
417426
struct snd_soc_card;
418427
struct snd_soc_pcm_stream;
@@ -427,6 +436,7 @@ struct soc_enum;
427436
struct snd_soc_jack;
428437
struct snd_soc_jack_zone;
429438
struct snd_soc_jack_pin;
439+
430440
#include <sound/soc-dapm.h>
431441
#include <sound/soc-dpcm.h>
432442
#include <sound/soc-topology.h>

0 commit comments

Comments
 (0)