| Message ID | 20231004163030.670039-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: qcom: reduce number of binding headers includes | expand |
On 04/10/2023 18:30, Krzysztof Kozlowski wrote: > Move the includes of binding headers from Qualcomm SoC sound drivers > headers to unit files actually using these bindings. This reduces the > amount of work for C preprocessor and makes usage of bindings easier to > follow. No impact expected on final binaries. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > sound/soc/qcom/apq8016_sbc.c | 1 + > sound/soc/qcom/common.c | 2 +- > sound/soc/qcom/lpass-cdc-dma.c | 1 + > sound/soc/qcom/lpass-cpu.c | 1 + > sound/soc/qcom/lpass-platform.c | 1 + > sound/soc/qcom/lpass.h | 1 - > sound/soc/qcom/qdsp6/q6afe-clocks.c | 1 + > sound/soc/qcom/qdsp6/q6afe-dai.c | 1 + > sound/soc/qcom/qdsp6/q6afe.c | 1 + > sound/soc/qcom/qdsp6/q6afe.h | 2 -- > sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 1 + > sound/soc/qcom/qdsp6/q6apm.h | 1 - > sound/soc/qcom/qdsp6/q6asm-dai.c | 1 + > sound/soc/qcom/qdsp6/q6asm.c | 1 + > sound/soc/qcom/qdsp6/q6asm.h | 1 - > sound/soc/qcom/qdsp6/q6prm-clocks.c | 2 +- > sound/soc/qcom/qdsp6/q6routing.c | 2 ++ > sound/soc/qcom/sc7180.c | 2 +- > sound/soc/qcom/sc7280.c | 2 ++ > sound/soc/qcom/sc8280xp.c | 1 + > sound/soc/qcom/sdm845.c | 1 + > sound/soc/qcom/sdw.c | 2 +- > sound/soc/qcom/sm8250.c | 1 + I missed few cases of header dependencies, as pointed out by kbuild. I will send v2. Best regards, Krzysztof
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index ff9f6a1c95df..efbdbb4dd753 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -16,6 +16,7 @@ #include <sound/soc.h> #include <uapi/linux/input-event-codes.h> #include <dt-bindings/sound/apq8016-lpass.h> +#include <dt-bindings/sound/qcom,q6afe.h> #include "common.h" #include "qdsp6/q6afe.h" diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index f2d1e3009cd2..483bbf53a541 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -2,10 +2,10 @@ // Copyright (c) 2018, Linaro Limited. // Copyright (c) 2018, The Linux Foundation. All rights reserved. +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> #include <sound/jack.h> #include <linux/input-event-codes.h> -#include "qdsp6/q6afe.h" #include "common.h" static const struct snd_soc_dapm_widget qcom_jack_snd_widgets[] = { diff --git a/sound/soc/qcom/lpass-cdc-dma.c b/sound/soc/qcom/lpass-cdc-dma.c index 8221e2cbe35c..586f23049447 100644 --- a/sound/soc/qcom/lpass-cdc-dma.c +++ b/sound/soc/qcom/lpass-cdc-dma.c @@ -5,6 +5,7 @@ * lpass-cdc-dma.c -- ALSA SoC CDC DMA CPU DAI driver for QTi LPASS */ +#include <dt-bindings/sound/qcom,lpass.h> #include <linux/clk.h> #include <linux/module.h> #include <linux/export.h> diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 39571fed4001..d15039bb7f82 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -5,6 +5,7 @@ * lpass-cpu.c -- ALSA SoC CPU DAI driver for QTi LPASS */ +#include <dt-bindings/sound/qcom,lpass.h> #include <linux/clk.h> #include <linux/kernel.h> #include <linux/module.h> diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 73e3d39bd24c..5b99b41956ed 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -5,6 +5,7 @@ * lpass-platform.c -- ALSA SoC platform driver for QTi LPASS */ +#include <dt-bindings/sound/qcom,lpass.h> #include <linux/dma-mapping.h> #include <linux/export.h> #include <linux/kernel.h> diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index bdfe66ec3314..dd5e2ccad5d8 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -12,7 +12,6 @@ #include <linux/compiler.h> #include <linux/platform_device.h> #include <linux/regmap.h> -#include <dt-bindings/sound/qcom,lpass.h> #include "lpass-hdmi.h" #define LPASS_AHBIX_CLOCK_FREQUENCY 131072000 diff --git a/sound/soc/qcom/qdsp6/q6afe-clocks.c b/sound/soc/qcom/qdsp6/q6afe-clocks.c index 1ccab64ff00b..84b9018c36ba 100644 --- a/sound/soc/qcom/qdsp6/q6afe-clocks.c +++ b/sound/soc/qcom/qdsp6/q6afe-clocks.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020, Linaro Limited +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/err.h> #include <linux/init.h> #include <linux/clk-provider.h> diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c index 3faa7e0eb0dd..a9c4f896a7df 100644 --- a/sound/soc/qcom/qdsp6/q6afe-dai.c +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c @@ -2,6 +2,7 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/err.h> #include <linux/init.h> #include <linux/module.h> diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c index 919e326b9462..91d39f6ad0bd 100644 --- a/sound/soc/qcom/qdsp6/q6afe.c +++ b/sound/soc/qcom/qdsp6/q6afe.c @@ -2,6 +2,7 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/slab.h> #include <linux/kernel.h> #include <linux/uaccess.h> diff --git a/sound/soc/qcom/qdsp6/q6afe.h b/sound/soc/qcom/qdsp6/q6afe.h index 30fd77e2f458..65d0676075e1 100644 --- a/sound/soc/qcom/qdsp6/q6afe.h +++ b/sound/soc/qcom/qdsp6/q6afe.h @@ -3,8 +3,6 @@ #ifndef __Q6AFE_H__ #define __Q6AFE_H__ -#include <dt-bindings/sound/qcom,q6afe.h> - #define AFE_PORT_MAX 129 #define MSM_AFE_PORT_TYPE_RX 0 diff --git a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c index 7ad604b80e25..a3864eea02d5 100644 --- a/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c +++ b/sound/soc/qcom/qdsp6/q6apm-lpass-dais.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2021, Linaro Limited +#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> #include <linux/err.h> #include <linux/init.h> #include <linux/module.h> diff --git a/sound/soc/qcom/qdsp6/q6apm.h b/sound/soc/qcom/qdsp6/q6apm.h index f486bd639b9f..c248c8d2b1ab 100644 --- a/sound/soc/qcom/qdsp6/q6apm.h +++ b/sound/soc/qcom/qdsp6/q6apm.h @@ -13,7 +13,6 @@ #include <linux/of_platform.h> #include <linux/jiffies.h> #include <linux/soc/qcom/apr.h> -#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> #include "audioreach.h" #define APM_PORT_MAX 127 diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index 5e14cd0a38de..a7e37c6e4e92 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -2,6 +2,7 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited +#include <dt-bindings/sound/qcom,q6asm.h> #include <linux/init.h> #include <linux/err.h> #include <linux/module.h> diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 195780f75d05..06a802f9dba5 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -2,6 +2,7 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited +#include <dt-bindings/sound/qcom,q6asm.h> #include <linux/mutex.h> #include <linux/wait.h> #include <linux/module.h> diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h index 394604c34943..0103d8dae5da 100644 --- a/sound/soc/qcom/qdsp6/q6asm.h +++ b/sound/soc/qcom/qdsp6/q6asm.h @@ -2,7 +2,6 @@ #ifndef __Q6_ASM_H__ #define __Q6_ASM_H__ #include "q6dsp-common.h" -#include <dt-bindings/sound/qcom,q6asm.h> /* ASM client callback events */ #define CMD_PAUSE 0x0001 diff --git a/sound/soc/qcom/qdsp6/q6prm-clocks.c b/sound/soc/qcom/qdsp6/q6prm-clocks.c index 73b0cbac73d4..4c574b48ab00 100644 --- a/sound/soc/qcom/qdsp6/q6prm-clocks.c +++ b/sound/soc/qcom/qdsp6/q6prm-clocks.c @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2021, Linaro Limited +#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> #include <linux/err.h> #include <linux/init.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/device.h> #include <linux/platform_device.h> -#include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> #include "q6dsp-lpass-clocks.h" #include "q6prm.h" diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index c583faae3a3e..c0856c10d0a8 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -2,6 +2,8 @@ // Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. // Copyright (c) 2018, Linaro Limited +#include <dt-bindings/sound/qcom,q6asm.h> +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/init.h> #include <linux/err.h> #include <linux/module.h> diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index d1fd40e3f7a9..b2211212c53c 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -4,6 +4,7 @@ // // sc7180.c -- ALSA SoC Machine driver for SC7180 +#include <dt-bindings/sound/qcom,lpass.h> #include <dt-bindings/sound/sc7180-lpass.h> #include <linux/gpio.h> #include <linux/gpio/consumer.h> @@ -19,7 +20,6 @@ #include "../codecs/rt5682.h" #include "../codecs/rt5682s.h" #include "common.h" -#include "lpass.h" #define DEFAULT_MCLK_RATE 19200000 #define RT5682_PLL1_FREQ (48000 * 512) diff --git a/sound/soc/qcom/sc7280.c b/sound/soc/qcom/sc7280.c index c23df4c8f341..f61989d6b57d 100644 --- a/sound/soc/qcom/sc7280.c +++ b/sound/soc/qcom/sc7280.c @@ -4,6 +4,8 @@ // // ALSA SoC Machine driver for sc7280 +#include <dt-bindings/sound/qcom,lpass.h> +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/input.h> #include <linux/module.h> #include <linux/of_device.h> diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index cfb9c8dbd599..6d4a43f94d51 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2022, Linaro Limited +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/of_device.h> diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 25b964dea6c5..fed5673b61ba 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -3,6 +3,7 @@ * Copyright (c) 2018, The Linux Foundation. All rights reserved. */ +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/of_device.h> diff --git a/sound/soc/qcom/sdw.c b/sound/soc/qcom/sdw.c index ce89c0a33ef0..dd275123d31d 100644 --- a/sound/soc/qcom/sdw.c +++ b/sound/soc/qcom/sdw.c @@ -2,9 +2,9 @@ // Copyright (c) 2018, Linaro Limited. // Copyright (c) 2018, The Linux Foundation. All rights reserved. +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> #include <sound/soc.h> -#include "qdsp6/q6afe.h" #include "sdw.h" int qcom_snd_sdw_prepare(struct snd_pcm_substream *substream, diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index 6558bf2e14e8..b7e1a5496cfd 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020, Linaro Limited +#include <dt-bindings/sound/qcom,q6afe.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/of_device.h>
Move the includes of binding headers from Qualcomm SoC sound drivers headers to unit files actually using these bindings. This reduces the amount of work for C preprocessor and makes usage of bindings easier to follow. No impact expected on final binaries. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- sound/soc/qcom/apq8016_sbc.c | 1 + sound/soc/qcom/common.c | 2 +- sound/soc/qcom/lpass-cdc-dma.c | 1 + sound/soc/qcom/lpass-cpu.c | 1 + sound/soc/qcom/lpass-platform.c | 1 + sound/soc/qcom/lpass.h | 1 - sound/soc/qcom/qdsp6/q6afe-clocks.c | 1 + sound/soc/qcom/qdsp6/q6afe-dai.c | 1 + sound/soc/qcom/qdsp6/q6afe.c | 1 + sound/soc/qcom/qdsp6/q6afe.h | 2 -- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 1 + sound/soc/qcom/qdsp6/q6apm.h | 1 - sound/soc/qcom/qdsp6/q6asm-dai.c | 1 + sound/soc/qcom/qdsp6/q6asm.c | 1 + sound/soc/qcom/qdsp6/q6asm.h | 1 - sound/soc/qcom/qdsp6/q6prm-clocks.c | 2 +- sound/soc/qcom/qdsp6/q6routing.c | 2 ++ sound/soc/qcom/sc7180.c | 2 +- sound/soc/qcom/sc7280.c | 2 ++ sound/soc/qcom/sc8280xp.c | 1 + sound/soc/qcom/sdm845.c | 1 + sound/soc/qcom/sdw.c | 2 +- sound/soc/qcom/sm8250.c | 1 + 23 files changed, 21 insertions(+), 9 deletions(-)