dmaengine: zynqmp_dma: drop redundant label

PATCH Applied Vinod Koul 4 participants 8 messages Sep 3 – Sep 7

Subsystems (2)

Arm/Zynq architecture dmaengine

lore

Share & tools

lore

Vinod Koul

author maintainer

2026-09-03 17:04 UTC #0 lore raw

PATCH 1/1 dmaengine: zynqmp_dma: drop redundant label

Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:

drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label]
1171 | err_disable_pm:

Drop it

Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")

Signed-off-by Vinod Koul <[email protected]>

---
 drivers/dma/xilinx/zynqmp_dma.c | 1 -
 1 file changed, 1 deletion(-)

drivers/dma/xilinx/zynqmp_dma.c +0 -1

index d1ee51dde3d1..3b7dfa53f972 100644
@@ -1168,7 +1168,6 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
 
 free_chan_resources:
 	zynqmp_dma_chan_remove(zdev->chan);
-err_disable_pm:
 	if (!pm_runtime_enabled(zdev->dev))
 		zynqmp_dma_runtime_suspend(zdev->dev);
 	pm_runtime_disable(zdev->dev);

Signature · 1 line

2.43.0

[email protected]

AI review

2026-09-03 17:11 UTC #1 lore raw

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Removing the `err_disable_pm` label causes a compilation failure because a `goto err_disable_pm;`…

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Removing the err_disable_pm label causes a compilation failure because a goto err_disable_pm; statement remains in zynqmp_dma_probe(). --

commit b231b06f7a09316d1f0854b835d97d063a04395f
Author: Vinod Koul <[email protected]>

dmaengine: zynqmp_dma: drop redundant label

This commit removes the err_disable_pm label from zynqmp_dma_probe() to fix an unused label warning reported after an earlier runtime PM update.

drivers/dma/xilinx/zynqmp_dma.c static int zynqmp_dma_probe(struct platform_device *pdev) · line 1152

Quoted 9 lines

drivers/dma/xilinx/zynqmp_dma.c +0 -1

index 2b03584102acf..71a310d50ee33 100644
@@ -1149,7 +1149,6 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
 
 free_chan_resources:
 	zynqmp_dma_chan_remove(zdev->chan);
-err_disable_pm:

[Severity: Low]
Does this change cause a build failure?

Looking at zynqmp_dma_probe(), it appears there is still a jump to this label earlier in the function:

	ret = zynqmp_dma_chan_probe(zdev, pdev);
	if (ret) {
		dev_err_probe(&pdev->dev, ret, "Probing channel failed\n");
		goto err_disable_pm;
	}

If the label is removed, won't the compiler fail with an undeclared label error during compilation?

Quoted 3 lines

drivers/dma/xilinx/zynqmp_dma.c +0 -0

 	if (!pm_runtime_enabled(zdev->dev))
 		zynqmp_dma_runtime_suspend(zdev->dev);
 	pm_runtime_disable(zdev->dev);

Signature · 1 line

Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1

Frank Li

Reviewed-by on v1 1/1

2026-09-03 19:01 UTC #2 lore raw

In reply to Vinod Koul

Quoted 7 lines · Vinod Koul

Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label]
1171 | err_disable_pm:

Quoted 5 lines

Drop it
Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")
Signed-off-by Vinod Koul <[email protected]>
---

Reviewed-by Frank Li <[email protected]>

Quoted 18 lines

 drivers/dma/xilinx/zynqmp_dma.c | 1 -
 1 file changed, 1 deletion(-)

drivers/dma/xilinx/zynqmp_dma.c +0 -2

index d1ee51dde3d1..3b7dfa53f972 100644
@@ -1168,7 +1168,6 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
 
 free_chan_resources:
 	zynqmp_dma_chan_remove(zdev->chan);
-err_disable_pm:
 	if (!pm_runtime_enabled(zdev->dev))
 		zynqmp_dma_runtime_suspend(zdev->dev);
 	pm_runtime_disable(zdev->dev);
--

2.43.0

Pandey, Radhey Shyam

Reviewed-by Radhey Shyam Pandey on v1 1/1

2026-09-05 15:32 UTC #3 lore raw

In reply to Vinod Koul

Quoted 10 lines · Vinod Koul

Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label]
1171 | err_disable_pm:
Drop it
Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")

Seems Fixes tag is incorrect.

Fixes 3f30db282c28 ("dmaengine: zynqmp_dma: Fix chan probe/remove error handling")

Rest looks fine to me.

Reviewed-by Radhey Shyam Pandey <[email protected]>

Thanks!

Quoted 17 lines

Signed-off-by Vinod Koul <[email protected]>

---
  drivers/dma/xilinx/zynqmp_dma.c | 1 -
  1 file changed, 1 deletion(-)

drivers/dma/xilinx/zynqmp_dma.c +0 -1

index d1ee51dde3d1..3b7dfa53f972 100644
@@ -1168,7 +1168,6 @@ static int zynqmp_dma_probe(struct platform_device *pdev)
 
  free_chan_resources:
  	zynqmp_dma_chan_remove(zdev->chan);
-err_disable_pm:
  	if (!pm_runtime_enabled(zdev->dev))
  		zynqmp_dma_runtime_suspend(zdev->dev);
  	pm_runtime_disable(zdev->dev);

Pandey, Radhey Shyam

2026-09-06 11:19 UTC #4 lore raw

Quoted 10 lines · Radhey Shyam

Quoted 9 lines · Vinod Koul
Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label] 1171 | err_disable_pm:
Drop it

Quoted 8 lines

Quoted 1 line
Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")
Seems Fixes tag is incorrect.
Fixes 3f30db282c28 ("dmaengine: zynqmp_dma: Fix chan probe/remove error handling")
Rest looks fine to me.
Reviewed-by Radhey Shyam Pandey <[email protected]>
Thanks!

Just a thought - this bug is present in dmaengine/next and if it isn't pushed to external we can squash this patch to fixes commit itself (if rebase on next is possible)?

Quoted 18 lines

Quoted 17 lines
Signed-off-by Vinod Koul <[email protected]>
---
drivers/dma/xilinx/zynqmp_dma.c | 1 -
  1 file changed, 1 deletion(-)
drivers/dma/xilinx/zynqmp_dma.c +0 -0
index d1ee51dde3d1..3b7dfa53f972 100644
@@ -1168,7 +1168,6 @@ static int zynqmp_dma_probe(struct 
 platform_device *pdev)
free_chan_resources:
      zynqmp_dma_chan_remove(zdev->chan);
-err_disable_pm:
      if (!pm_runtime_enabled(zdev->dev))
          zynqmp_dma_runtime_suspend(zdev->dev);
      pm_runtime_disable(zdev->dev);

Vinod Koul

author maintainer

2026-09-07 07:27 UTC #5 lore raw

Quoted 18 lines · Radhey Shyam

Quoted 17 lines · Radhey Shyam
Quoted 11 lines · Vinod Koul
Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label] 1171 | err_disable_pm:
Drop it
Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")
Seems Fixes tag is incorrect.
Fixes 3f30db282c28 ("dmaengine: zynqmp_dma: Fix chan probe/remove error
handling")

Quoted 7 lines

Quoted 3 lines
Rest looks fine to me.
Reviewed-by Radhey Shyam Pandey <[email protected]>
Thanks!
Just a thought - this bug is present in dmaengine/next and if it isn't pushed to external we can squash this patch to fixes commit itself (if rebase on next is possible)?

Yes this is for a patch I applied and found while building. So will apply this...

Signature · 1 line

~Vinod

Vinod Koul

author maintainer

2026-09-07 13:48 UTC #6 lore raw

In reply to Pandey, Radhey Shyam

Quoted 8 lines · Radhey Shyam

Quoted 7 lines · Vinod Koul
Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label]
1171 | err_disable_pm:

Quoted 7 lines

Quoted 3 lines
Drop it
Fixes 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support")
Seems Fixes tag is incorrect.
Fixes 3f30db282c28 ("dmaengine: zynqmp_dma: Fix chan probe/remove error
handling")

Yeah my fixup tool picked the wrong one, I have added this, thanks

Signature · 1 line

~Vinod

Vinod Koul

author maintainer Applied

2026-09-07 13:56 UTC #7 lore raw

In reply to Vinod Koul

Quoted 8 lines · Vinod Koul

Commit 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") dropped the use of err_disable_pm label causing warning:
drivers/dma/xilinx/zynqmp_dma.c: In function ‘zynqmp_dma_probe’:
drivers/dma/xilinx/zynqmp_dma.c:1171:1: error: label ‘err_disable_pm’ defined but not used [-Werror=unused-label]
1171 | err_disable_pm:
[...]

Applied, thanks!

[1/1] dmaengine: zynqmp_dma: drop redundant label

      commit: 22f293e054dfe8252cc02cf562d3e9e460f6e83f

Best regards,

Signature · 1 line

~Vinod