2021-06-16 05:53:41

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] ASoC: codecs: Fix duplicate included sound/soc.h

Clean up the following includecheck warnings:

./sound/soc/codecs/wcd938x.c: sound/soc.h is included more than once.
./sound/soc/codecs/wcd938x-sdw.c: sound/soc.h is included more than
once.

No functional change.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
---
sound/soc/codecs/wcd938x-sdw.c | 1 -
sound/soc/codecs/wcd938x.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c
index d82c40e..88334d3 100644
--- a/sound/soc/codecs/wcd938x-sdw.c
+++ b/sound/soc/codecs/wcd938x-sdw.c
@@ -7,7 +7,6 @@
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/component.h>
-#include <sound/soc.h>
#include <linux/pm_runtime.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index 2cf6145..c0d7452 100644
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/pm_runtime.h>
#include <linux/component.h>
-#include <sound/soc.h>
#include <sound/tlv.h>
#include <linux/of_gpio.h>
#include <linux/of.h>
--
1.8.3.1


2021-06-16 22:52:50

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: codecs: Fix duplicate included sound/soc.h

On Wed, 16 Jun 2021 13:51:07 +0800, Jiapeng Chong wrote:
> Clean up the following includecheck warnings:
>
> ./sound/soc/codecs/wcd938x.c: sound/soc.h is included more than once.
> ./sound/soc/codecs/wcd938x-sdw.c: sound/soc.h is included more than
> once.
>
> No functional change.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: codecs: Fix duplicate included sound/soc.h
commit: 06cc52329cb098ba0858032998e382311dcd9743

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark