Re: [PATCH] ASoC: do not include pm_runtime.h if not used

[Claudiu.Beznea]

On 10.03.2023 09:29, Srinivas Kandagatla wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the
> content is safe
> 
> On 07/03/2023 10:30, Claudiu Beznea wrote:
>> diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c
>> index 41db6617e2ed..dc892fac4baa 100644
>> --- a/sound/soc/qcom/lpass-sc7180.c
>> +++ b/sound/soc/qcom/lpass-sc7180.c
>> @@ -12,7 +12,6 @@
>>   #include 
>>   #include 
>>   #include 
>> -#include 
>>   #include 
>>   #include 
>>   #include 
>> diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c
>> index d43f480cbae3..ee4a4b553e74 100644
>> --- a/sound/soc/qcom/lpass-sc7280.c
>> +++ b/sound/soc/qcom/lpass-sc7280.c
>> @@ -8,7 +8,6 @@
>>   #include 
>>   #include 
>>   #include 
>> -#include 
>>
>>   #include 
> 
> Has these been compile tested? the reason I ask is because both these
> drivers need SET_SYSTEM_SLEEP_PM_OPS macro from pm.h which was getting
> included from pm_runtime.h, now that is removed, am guessing it will
> cause a compile errors.

I remember I compiled them all. But I will double check it.

> 
> can you atleast replace this with pm.h instead of removing it totally?

Sure! Thanks for pointing it.

> 
> --srini

Re: [PATCH] ASoC: do not include pm_runtime.h if not used

[Srinivas Kandagatla]

On 07/03/2023 10:30, Claudiu Beznea wrote:

diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c
index 41db6617e2ed..dc892fac4baa 100644
--- a/sound/soc/qcom/lpass-sc7180.c
+++ b/sound/soc/qcom/lpass-sc7180.c
@@ -12,7 +12,6 @@
  #include 
  #include 
  #include 
-#include 
  #include 
  #include 
  #include 
diff --git a/sound/soc/qcom/lpass-sc7280.c b/sound/soc/qcom/lpass-sc7280.c
index d43f480cbae3..ee4a4b553e74 100644
--- a/sound/soc/qcom/lpass-sc7280.c
+++ b/sound/soc/qcom/lpass-sc7280.c
@@ -8,7 +8,6 @@
  #include 
  #include 
  #include 
-#include 
  
  #include 


Has these been compile tested? the reason I ask is because both these 
drivers need SET_SYSTEM_SLEEP_PM_OPS macro from pm.h which was getting 
included from pm_runtime.h, now that is removed, am guessing it will 
cause a compile errors.


can you atleast replace this with pm.h instead of removing it totally?

--srini

Re: [PATCH] ASoC: do not include pm_runtime.h if not used

[Jarkko Nikula]

On Tue, Mar 07, 2023 at 12:30:22PM +0200, Claudiu Beznea wrote:
> Do not include pm_runtime.h header in files where runtime PM support is
> not implemented.
> 
> Signed-off-by: Claudiu Beznea 
> ---
...
>  sound/soc/ti/omap-mcbsp-st.c  | 1 -
>  36 files changed, 37 deletions(-)

Looks like header was copied by accident from omap-mcbsp.c when sidetone
functionality was split into this new file.

Acked-by: Jarkko Nikula 

[PATCH] ASoC: do not include pm_runtime.h if not used

[Claudiu Beznea]

Do not include pm_runtime.h header in files where runtime PM support is
not implemented.

Signed-off-by: Claudiu Beznea 
---
 sound/hda/hdac_regmap.c   | 1 -
 sound/pci/hda/hda_bind.c  | 1 -
 sound/soc/amd/acp/acp-pci.c   | 1 -
 sound/soc/amd/acp/acp-platform.c  | 1 -
 sound/soc/codecs/cs35l45.h| 1 -
 sound/soc/codecs/max98090.c   | 1 -
 sound/soc/codecs/max98373-i2c.c   | 1 -
 sound/soc/codecs/pcm186x.c| 1 -
 sound/soc/codecs/rk3328_codec.c   | 1 -
 sound/soc/codecs/rt5682-i2c.c | 1 -
 sound/soc/codecs/rt5682s.c| 1 -
 sound/soc/codecs/tas2562.c| 1 -
 sound/soc/codecs/tas5720.c| 1 -
 sound/soc/codecs/tas6424.c| 1 -
 sound/soc/codecs/wm_adsp.c| 1 -
 sound/soc/fsl/imx-audmix.c| 1 -
 sound/soc/intel/atom/sst/sst_acpi.c   | 1 -
 sound/soc/intel/atom/sst/sst_ipc.c| 1 -
 sound/soc/intel/atom/sst/sst_loader.c | 1 -
 sound/soc/intel/atom/sst/sst_pci.c| 1 -
 sound/soc/intel/atom/sst/sst_stream.c | 1 -
 sound/soc/mediatek/mt8186/mt8186-afe-control.c| 1 -
 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 1 -
 sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c  | 1 -
 sound/soc/mediatek/mt8192/mt8192-afe-control.c| 2 --
 sound/soc/qcom/lpass-sc7180.c | 1 -
 sound/soc/qcom/lpass-sc7280.c | 1 -
 sound/soc/soc-compress.c  | 1 -
 sound/soc/soc-pcm.c   | 1 -
 sound/soc/sof/intel/hda-loader-skl.c  | 1 -
 sound/soc/sof/intel/hda-stream.c  | 1 -
 sound/soc/sof/intel/skl.c | 1 -
 sound/soc/sof/mediatek/mt8186/mt8186-clk.c| 1 -
 sound/soc/sof/mediatek/mt8195/mt8195-clk.c| 1 -
 sound/soc/tegra/tegra20_ac97.c| 1 -
 sound/soc/ti/omap-mcbsp-st.c  | 1 -
 36 files changed, 37 deletions(-)

diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index fe3587547cfe..7cfaa908ff57 100644
--- a/sound/hda/hdac_regmap.c
+++ b/sound/hda/hdac_regmap.c
@@ -17,7 +17,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c
index 1a868dd9dc4b..323c388b1219 100644
--- a/sound/pci/hda/hda_bind.c
+++ b/sound/pci/hda/hda_bind.c
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "hda_local.h"
diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c
index a0c84cd07fde..8154fbfd1229 100644
--- a/sound/soc/amd/acp/acp-pci.c
+++ b/sound/soc/amd/acp/acp-pci.c
@@ -15,7 +15,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "amd.h"
diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 447612a7a762..f220378ec20e 100644
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -18,7 +18,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include "amd.h"
diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h
index 53fe9d2b7b15..0555702eac03 100644
--- a/sound/soc/codecs/cs35l45.h
+++ b/sound/soc/codecs/cs35l45.h
@@ -11,7 +11,6 @@
 #ifndef CS35L45_H
 #define CS35L45_H
 
-#include 
 #include 
 #include 
 
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 06ed2a938108..508086e6e39f 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -10,7 +10,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sound/soc/codecs/max98373-i2c.c b/sound/soc/codecs/max98373-i2c.c
index ec0905df65d1..0ef33404252d 100644
--- a/sound/soc/codecs/max98373-i2c.c
+++ b/sound/soc/codecs/max98373-i2c.c
@@ -9,7 +9,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sound/soc/codecs/pcm186x.c b/sound/soc/codecs/pcm186x.c
index dd21803ba13c..451a8fd8fac5 100644
--- a/sound/soc/codecs/pcm186x.c
+++ b/sound/soc/codecs/pcm186x.c
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c
index 1d523bfd9d84..9697aefc6e03 100644
--- a/sound/soc/codecs/rk3328_codec.c
+++ b/sound/soc/codecs/rk3328_codec.c
@@ -11,7 +11,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff 

Re: [PATCH] ASoC: do not include pm_runtime.h if not used

[Charles Keepax]

On Tue, Mar 07, 2023 at 12:30:22PM +0200, Claudiu Beznea wrote:
> Do not include pm_runtime.h header in files where runtime PM support is
> not implemented.
> 
> Signed-off-by: Claudiu Beznea 
> ---
>  sound/soc/codecs/cs35l45.h| 1 -
> diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h
> index 53fe9d2b7b15..0555702eac03 100644
> --- a/sound/soc/codecs/cs35l45.h
> +++ b/sound/soc/codecs/cs35l45.h
> @@ -11,7 +11,6 @@
>  #ifndef CS35L45_H
>  #define CS35L45_H
>  
> -#include 
>  #include 
>  #include 
>  

cs35l45 does already make use of some functions from that header,
and more support is in the process of being upstreamed. So this
part should be dropped.

Thanks,
Charles