ASoC: Intel: catpt: avoid type mismatch in dev_dbg() format
Subsystems (3)
PATCH 1/1 ASoC: Intel: catpt: avoid type mismatch in dev_dbg() format
From: Arnd Bergmann <[email protected]>
Depending on the architecture __ffs() returns either an 'unsigned long' or 'unsigned int' result. Compile-testing this driver on targets that use the latter produces a warning:
sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_srampge':sound/soc/intel/catpt/dsp.c:181:44: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'u32' {aka 'unsigned int'} [-Werror=format=]
181 | dev_dbg(cdev->dev, "sanitize block %ld: off 0x%08x\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Change the type of the local variable to match the format string and avoid the warning on any architecture.
--- sound/soc/intel/catpt/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/catpt/dsp.c +1 -1
@@ -156,7 +156,7 @@ static void catpt_dsp_set_srampge(struct catpt_dev *cdev, struct resource *sram, {unsigned long old;u32 off = sram->start; -u32 b =__ffs (mask); +unsigned long b =__ffs (mask); old =catpt_readl_pci (cdev,VDRTCTL0 ) & mask; dev_dbg(cdev->dev, "SRAMPGE [0x%08lx] 0x%08lx -> 0x%08lx",
Signature · 1 line
2.39.5
Quoted 24 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Depending on the architecture
__ffs()returns either an 'unsigned long' or 'unsigned int' result. Compile-testing this driver on targets that use the latter produces a warning:
sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_srampge':sound/soc/intel/catpt/dsp.c:181:44: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'u32' {aka 'unsigned int'} [-Werror=format=]
181 | dev_dbg(cdev->dev, "sanitize block %ld: off 0x%08x\n",| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Change the type of the local variable to match the format string and avoid the warning on any architecture.
Signed-off-by Arnd Bergmann <[email protected]>--- sound/soc/intel/catpt/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)sound/soc/intel/catpt/dsp.c +0
-0
sound/soc/intel/catpt/dsp.c static void catpt_dsp_set_srampge(struct catpt_dev *cdev, struct resource *sram, · line 162
Quoted 8 lines
sound/soc/intel/catpt/dsp.c +1
-1@@ -156,7 +156,7 @@ static void catpt_dsp_set_srampge(struct catpt_dev *cdev, struct resource *sram, {unsigned long old;u32 off = sram->start; -u32 b =__ffs (mask); +unsigned long b =__ffs (mask); old =catpt_readl_pci (cdev,VDRTCTL0 ) & mask; dev_dbg(cdev->dev, "SRAMPGE [0x%08lx] 0x%08lx -> 0x%08lx",
Thank you for this contribution, LGTM.
Mark Brown
maintainerQuoted 10 lines · Arnd Bergmann
Depending on the architecture
__ffs()returns either an 'unsigned long' or 'unsigned int' result. Compile-testing this driver on targets that use the latter produces a warning:
sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_srampge':sound/soc/intel/catpt/dsp.c:181:44: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'u32' {aka 'unsigned int'} [-Werror=format=]
181 | dev_dbg(cdev->dev, "sanitize block %ld: off 0x%08x\n",| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Intel: catpt: avoid type mismatch in dev_dbg() format
commit: 95b2536137eeb66f20947e0fb0d0c100c8d6a140
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