diff mbox series

ASoC: amd: acp: Fix initialization of ext_intr_stat1 in i2s_irq_handler()

Message ID 20220725180539.1315066-1-nathan@kernel.org
State Accepted
Commit d81677410f172c2b946393c09b46ff9e8dc1b6ec
Headers show
Series ASoC: amd: acp: Fix initialization of ext_intr_stat1 in i2s_irq_handler() | expand

Commit Message

Nathan Chancellor July 25, 2022, 6:05 p.m. UTC
Clang warns:

  ../sound/soc/amd/acp/acp-platform.c:117:19: error: variable 'ext_intr_stat1' is uninitialized when used here [-Werror,-Wuninitialized]
                          if (stream && (ext_intr_stat1 & stream->irq_bit)) {
                                         ^~~~~~~~~~~~~~
  ../sound/soc/amd/acp/acp-platform.c:97:35: note: initialize the variable 'ext_intr_stat1' to silence this warning
          u32 ext_intr_stat, ext_intr_stat1, i;
                                           ^
                                            = 0
  1 error generated.

The variable was not properly renamed, correct it to resolve the
warning.

Fixes: 93f53881473c ("ASoC: amd: acp: Modify local variables name to generic")
Link: https://github.com/ClangBuiltLinux/linux/issues/1675
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 sound/soc/amd/acp/acp-platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: be0aa8d4b0fcb4532bf7973141e911998ab39508

Comments

Tom Rix July 25, 2022, 8:30 p.m. UTC | #1
On 7/25/22 11:05 AM, Nathan Chancellor wrote:
> Clang warns:
>
>    ../sound/soc/amd/acp/acp-platform.c:117:19: error: variable 'ext_intr_stat1' is uninitialized when used here [-Werror,-Wuninitialized]
>                            if (stream && (ext_intr_stat1 & stream->irq_bit)) {
>                                           ^~~~~~~~~~~~~~
>    ../sound/soc/amd/acp/acp-platform.c:97:35: note: initialize the variable 'ext_intr_stat1' to silence this warning
>            u32 ext_intr_stat, ext_intr_stat1, i;
>                                             ^
>                                              = 0
>    1 error generated.
>
> The variable was not properly renamed, correct it to resolve the
> warning.
>
> Fixes: 93f53881473c ("ASoC: amd: acp: Modify local variables name to generic")
> Link: https://github.com/ClangBuiltLinux/linux/issues/1675
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Tom Rix <trix@redhat.com>
> ---
>   sound/soc/amd/acp/acp-platform.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
> index 10730d33c3b0..f561d39b33e2 100644
> --- a/sound/soc/amd/acp/acp-platform.c
> +++ b/sound/soc/amd/acp/acp-platform.c
> @@ -100,7 +100,7 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
>   		return IRQ_NONE;
>   
>   	if (adata->rsrc->no_of_ctrls == 2)
> -		ext_intr_stat = readl(ACP_EXTERNAL_INTR_STAT(adata, (rsrc->irqp_used - 1)));
> +		ext_intr_stat1 = readl(ACP_EXTERNAL_INTR_STAT(adata, (rsrc->irqp_used - 1)));
>   
>   	ext_intr_stat = readl(ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
>   
>
> base-commit: be0aa8d4b0fcb4532bf7973141e911998ab39508
Mark Brown July 26, 2022, 1:07 p.m. UTC | #2
On Mon, 25 Jul 2022 11:05:39 -0700, Nathan Chancellor wrote:
> Clang warns:
> 
>   ../sound/soc/amd/acp/acp-platform.c:117:19: error: variable 'ext_intr_stat1' is uninitialized when used here [-Werror,-Wuninitialized]
>                           if (stream && (ext_intr_stat1 & stream->irq_bit)) {
>                                          ^~~~~~~~~~~~~~
>   ../sound/soc/amd/acp/acp-platform.c:97:35: note: initialize the variable 'ext_intr_stat1' to silence this warning
>           u32 ext_intr_stat, ext_intr_stat1, i;
>                                            ^
>                                             = 0
>   1 error generated.
> 
> [...]

Applied to

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

Thanks!

[1/1] ASoC: amd: acp: Fix initialization of ext_intr_stat1 in i2s_irq_handler()
      commit: d81677410f172c2b946393c09b46ff9e8dc1b6ec

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
diff mbox series

Patch

diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 10730d33c3b0..f561d39b33e2 100644
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -100,7 +100,7 @@  static irqreturn_t i2s_irq_handler(int irq, void *data)
 		return IRQ_NONE;
 
 	if (adata->rsrc->no_of_ctrls == 2)
-		ext_intr_stat = readl(ACP_EXTERNAL_INTR_STAT(adata, (rsrc->irqp_used - 1)));
+		ext_intr_stat1 = readl(ACP_EXTERNAL_INTR_STAT(adata, (rsrc->irqp_used - 1)));
 
 	ext_intr_stat = readl(ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));