From 3582cf94ff49469ffe78e96014550f7d4e466fbd Mon Sep 17 00:00:00 2001 From: Walker Chen Date: Thu, 8 Jun 2023 21:57:49 +0800 Subject: [PATCH 1/2] ASoC: starfive: Fix an error check in jh7110_tdm_clk_reset_get() Fix the check for devm_reset_control_array_get_exclusive() return value. The devm_reset_control_array_get_exclusive() function may return NULL if it's an optional request. If optional is intended then NULL should not be treated as an error case, but as a special kind of success case. So here the IS_ERR() is used to check better. Signed-off-by: Walker Chen Reviewed-by: Claudiu Beznea Link: https://lore.kernel.org/r/20230608135750.11041-2-walker.chen@starfivetech.com Signed-off-by: Mark Brown --- sound/soc/starfive/jh7110_tdm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c index 973b910d2d3e..a9a3d52bdd2a 100644 --- a/sound/soc/starfive/jh7110_tdm.c +++ b/sound/soc/starfive/jh7110_tdm.c @@ -580,10 +580,9 @@ static int jh7110_tdm_clk_reset_get(struct platform_device *pdev, } tdm->resets = devm_reset_control_array_get_exclusive(&pdev->dev); - if (IS_ERR_OR_NULL(tdm->resets)) { - ret = PTR_ERR(tdm->resets); - dev_err(&pdev->dev, "Failed to get tdm resets"); - return ret; + if (IS_ERR(tdm->resets)) { + dev_err(&pdev->dev, "Failed to get tdm resets\n"); + return PTR_ERR(tdm->resets); } return 0; From 8bd81864533bd02d6922deadeed643c813dfe142 Mon Sep 17 00:00:00 2001 From: Walker Chen Date: Thu, 8 Jun 2023 21:57:50 +0800 Subject: [PATCH 2/2] ASoC: starfive: Remove some unused macros These macros are unused and can be dropped. Signed-off-by: Walker Chen Reviewed-by: Claudiu Beznea Link: https://lore.kernel.org/r/20230608135750.11041-3-walker.chen@starfivetech.com Signed-off-by: Mark Brown --- sound/soc/starfive/jh7110_tdm.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/starfive/jh7110_tdm.c b/sound/soc/starfive/jh7110_tdm.c index a9a3d52bdd2a..e4bdba20c499 100644 --- a/sound/soc/starfive/jh7110_tdm.c +++ b/sound/soc/starfive/jh7110_tdm.c @@ -25,11 +25,8 @@ #include #define TDM_PCMGBCR 0x00 - #define PCMGBCR_MASK 0x1e #define PCMGBCR_ENABLE BIT(0) - #define PCMGBCR_TRITXEN BIT(4) #define CLKPOL_BIT 5 - #define TRITXEN_BIT 4 #define ELM_BIT 3 #define SYNCM_BIT 2 #define MS_BIT 1 @@ -42,11 +39,6 @@ #define LRJ_BIT 1 #define TDM_PCMRXCR 0x08 #define PCMRXCR_RXEN BIT(0) - #define PCMRXCR_RXSL_MASK 0xc - #define PCMRXCR_RXSL_16BIT 0x4 - #define PCMRXCR_RXSL_32BIT 0x8 - #define PCMRXCR_SCALE_MASK 0xf0 - #define PCMRXCR_SCALE_1CH 0x10 #define TDM_PCMDIV 0x0c #define JH7110_TDM_FIFO 0x170c0000