42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From e980be4df775be9bb64137ba8b619850199d8c60 Mon Sep 17 00:00:00 2001
|
|
From: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
|
|
Date: Wed, 3 Dec 2025 15:16:45 +0100
|
|
Subject: [PATCH 133/157] FROMLIST(v1): ASoC: rockchip: Fix
|
|
Wvoid-pointer-to-enum-cast warning (again)
|
|
|
|
'version' is an enum, thus cast of pointer on 64-bit compile test with
|
|
clang W=1 causes:
|
|
|
|
rockchip_pdm.c:583:17: error: cast to smaller integer type 'enum rk_pdm_version' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast]
|
|
|
|
This was already fixed in commit 49a4a8d12612 ("ASoC: rockchip: Fix
|
|
Wvoid-pointer-to-enum-cast warning") but then got bad in
|
|
commit 9958d85968ed ("ASoC: Use device_get_match_data()").
|
|
|
|
Discussion on LKML also pointed out that 'uintptr_t' is not the correct
|
|
type and either 'kernel_ulong_t' or 'unsigned long' should be used,
|
|
with several arguments towards the latter [1].
|
|
|
|
Link: https://lore.kernel.org/r/CAMuHMdX7t=mabqFE5O-Cii3REMuyaePHmqX+j_mqyrn6XXzsoA@mail.gmail.com/ [1]
|
|
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
|
|
---
|
|
sound/soc/rockchip/rockchip_pdm.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c
|
|
index c1ee470ec607..c69cdd6f2499 100644
|
|
--- a/sound/soc/rockchip/rockchip_pdm.c
|
|
+++ b/sound/soc/rockchip/rockchip_pdm.c
|
|
@@ -580,7 +580,7 @@ static int rockchip_pdm_probe(struct platform_device *pdev)
|
|
if (!pdm)
|
|
return -ENOMEM;
|
|
|
|
- pdm->version = (enum rk_pdm_version)device_get_match_data(&pdev->dev);
|
|
+ pdm->version = (unsigned long)device_get_match_data(&pdev->dev);
|
|
if (pdm->version == RK_PDM_RK3308) {
|
|
pdm->reset = devm_reset_control_get(&pdev->dev, "pdm-m");
|
|
if (IS_ERR(pdm->reset))
|
|
--
|
|
2.34.1
|
|
|