[linux-next,v2] ASoC: SOF: remove duplicated included sof-audio.h

Message ID 202211092130548796460@zte.com.cn
State New
Headers
Series [linux-next,v2] ASoC: SOF: remove duplicated included sof-audio.h |

Commit Message

Yang Yang Nov. 9, 2022, 1:30 p.m. UTC
  From: Xu Panda <xu.panda@zte.com.cn>

The sof-audio.h is included more than once.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

---
change for v2
 - add maintainers and the alsa-devel mailing list in CC.  
---

 sound/soc/sof/amd/acp-common.c | 1 -
 1 file changed, 1 deletion(-)
  

Comments

Péter Ujfalusi Nov. 9, 2022, 1:39 p.m. UTC | #1
On 09/11/2022 15:30, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
> 
> The sof-audio.h is included more than once.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> Signed-off-by: Yang Yang <yang.yang29@zte.com>
> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

> 
> ---
> change for v2
>  - add maintainers and the alsa-devel mailing list in CC.  
> ---
> 
>  sound/soc/sof/amd/acp-common.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c
> index 27b95187356e..348e70dfe2a5 100644
> --- a/sound/soc/sof/amd/acp-common.c
> +++ b/sound/soc/sof/amd/acp-common.c
> @@ -13,7 +13,6 @@
>  #include "../sof-priv.h"
>  #include "../sof-audio.h"
>  #include "../ops.h"
> -#include "../sof-audio.h"
>  #include "acp.h"
>  #include "acp-dsp-offset.h"
>
  
Mark Brown Nov. 10, 2022, 5:52 p.m. UTC | #2
On Wed, Nov 09, 2022 at 09:30:54PM +0800, yang.yang29@zte.com.cn wrote:
> From: Xu Panda <xu.panda@zte.com.cn>
> 
> The sof-audio.h is included more than once.

This doesn't apply against current code, please check and resend:

Applying: ASoC: SOF: remove duplicated included sof-audio.h
error: corrupt patch at line 21
error: could not build fake ancestor
Patch failed at 0005 ASoC: SOF: remove duplicated included sof-audio.h
  

Patch

diff --git a/sound/soc/sof/amd/acp-common.c b/sound/soc/sof/amd/acp-common.c
index 27b95187356e..348e70dfe2a5 100644
--- a/sound/soc/sof/amd/acp-common.c
+++ b/sound/soc/sof/amd/acp-common.c
@@ -13,7 +13,6 @@ 
 #include "../sof-priv.h"
 #include "../sof-audio.h"
 #include "../ops.h"
-#include "../sof-audio.h"
 #include "acp.h"
 #include "acp-dsp-offset.h"