[v1] nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers

[PATCH] nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers

Posted by Huan Yang 1 year, 5 months ago

The devm_clk_get_enabled() helpers:
    - call devm_clk_get()
    - call clk_prepare_enable() and register what is needed in order to
     call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

Signed-off-by: Huan Yang <link@vivo.com>
---
 drivers/nvmem/jz4780-efuse.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/nvmem/jz4780-efuse.c b/drivers/nvmem/jz4780-efuse.c
index 0b01b840edd9..2b5badfbf22f 100644
--- a/drivers/nvmem/jz4780-efuse.c
+++ b/drivers/nvmem/jz4780-efuse.c
@@ -131,11 +131,6 @@ static const struct regmap_config jz4780_efuse_regmap_config = {
 	.max_register = JZ_EFUDATA(7),
 };
 
-static void clk_disable_unprepare_helper(void *clock)
-{
-	clk_disable_unprepare(clock);
-}
-
 static int jz4780_efuse_probe(struct platform_device *pdev)
 {
 	struct nvmem_device *nvmem;
@@ -146,7 +141,6 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
 	unsigned long rd_strobe;
 	struct device *dev = &pdev->dev;
 	void __iomem *regs;
-	int ret;
 
 	efuse = devm_kzalloc(dev, sizeof(*efuse), GFP_KERNEL);
 	if (!efuse)
@@ -161,20 +155,10 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
 	if (IS_ERR(efuse->map))
 		return PTR_ERR(efuse->map);
 
-	efuse->clk = devm_clk_get(&pdev->dev, NULL);
+	efuse->clk = devm_clk_get_enabled(&pdev->dev, NULL);
 	if (IS_ERR(efuse->clk))
 		return PTR_ERR(efuse->clk);
 
-	ret = clk_prepare_enable(efuse->clk);
-	if (ret < 0)
-		return ret;
-
-	ret = devm_add_action_or_reset(&pdev->dev,
-				       clk_disable_unprepare_helper,
-				       efuse->clk);
-	if (ret < 0)
-		return ret;
-
 	clk_rate = clk_get_rate(efuse->clk);
 
 	efuse->dev = dev;
-- 
2.45.2

Re: [PATCH] nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers

Posted by Christophe JAILLET 1 year, 5 months ago

Le 20/08/2024 à 12:23, Huan Yang a écrit :
> The devm_clk_get_enabled() helpers:
>      - call devm_clk_get()
>      - call clk_prepare_enable() and register what is needed in order to
>       call clk_disable_unprepare() when needed, as a managed resource.
> 
> This simplifies the code and avoids the calls to clk_disable_unprepare().
> 
> Signed-off-by: Huan Yang <link@vivo.com>
> ---

Hi,

if you want to go 1 step further, I think that 'clk' can now also be 
removed from struct jz4780_efuse.

Just my 2c.

CJ

>   drivers/nvmem/jz4780-efuse.c | 18 +-----------------
>   1 file changed, 1 insertion(+), 17 deletions(-)
> 
> diff --git a/drivers/nvmem/jz4780-efuse.c b/drivers/nvmem/jz4780-efuse.c
> index 0b01b840edd9..2b5badfbf22f 100644
> --- a/drivers/nvmem/jz4780-efuse.c
> +++ b/drivers/nvmem/jz4780-efuse.c
> @@ -131,11 +131,6 @@ static const struct regmap_config jz4780_efuse_regmap_config = {
>   	.max_register = JZ_EFUDATA(7),
>   };
>   
> -static void clk_disable_unprepare_helper(void *clock)
> -{
> -	clk_disable_unprepare(clock);
> -}
> -
>   static int jz4780_efuse_probe(struct platform_device *pdev)
>   {
>   	struct nvmem_device *nvmem;
> @@ -146,7 +141,6 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
>   	unsigned long rd_strobe;
>   	struct device *dev = &pdev->dev;
>   	void __iomem *regs;
> -	int ret;
>   
>   	efuse = devm_kzalloc(dev, sizeof(*efuse), GFP_KERNEL);
>   	if (!efuse)
> @@ -161,20 +155,10 @@ static int jz4780_efuse_probe(struct platform_device *pdev)
>   	if (IS_ERR(efuse->map))
>   		return PTR_ERR(efuse->map);
>   
> -	efuse->clk = devm_clk_get(&pdev->dev, NULL);
> +	efuse->clk = devm_clk_get_enabled(&pdev->dev, NULL);
>   	if (IS_ERR(efuse->clk))
>   		return PTR_ERR(efuse->clk);
>   
> -	ret = clk_prepare_enable(efuse->clk);
> -	if (ret < 0)
> -		return ret;
> -
> -	ret = devm_add_action_or_reset(&pdev->dev,
> -				       clk_disable_unprepare_helper,
> -				       efuse->clk);
> -	if (ret < 0)
> -		return ret;
> -
>   	clk_rate = clk_get_rate(efuse->clk);
>   
>   	efuse->dev = dev;

Re: [PATCH] nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers

Posted by Huan Yang 1 year, 5 months ago

在 2024/8/20 21:21, Christophe JAILLET 写道:
> Le 20/08/2024 à 12:23, Huan Yang a écrit :
>> The devm_clk_get_enabled() helpers:
>>      - call devm_clk_get()
>>      - call clk_prepare_enable() and register what is needed in order to
>>       call clk_disable_unprepare() when needed, as a managed resource.
>>
>> This simplifies the code and avoids the calls to 
>> clk_disable_unprepare().
>>
>> Signed-off-by: Huan Yang <link@vivo.com>
>> ---
>
> Hi,
>
> if you want to go 1 step further, I think that 'clk' can now also be 
> removed from struct jz4780_efuse.

Sensible, I'll update it

Thanks

>
> Just my 2c.
>
> CJ
>
>>   drivers/nvmem/jz4780-efuse.c | 18 +-----------------
>>   1 file changed, 1 insertion(+), 17 deletions(-)
>>
>> diff --git a/drivers/nvmem/jz4780-efuse.c b/drivers/nvmem/jz4780-efuse.c
>> index 0b01b840edd9..2b5badfbf22f 100644
>> --- a/drivers/nvmem/jz4780-efuse.c
>> +++ b/drivers/nvmem/jz4780-efuse.c
>> @@ -131,11 +131,6 @@ static const struct regmap_config 
>> jz4780_efuse_regmap_config = {
>>       .max_register = JZ_EFUDATA(7),
>>   };
>>   -static void clk_disable_unprepare_helper(void *clock)
>> -{
>> -    clk_disable_unprepare(clock);
>> -}
>> -
>>   static int jz4780_efuse_probe(struct platform_device *pdev)
>>   {
>>       struct nvmem_device *nvmem;
>> @@ -146,7 +141,6 @@ static int jz4780_efuse_probe(struct 
>> platform_device *pdev)
>>       unsigned long rd_strobe;
>>       struct device *dev = &pdev->dev;
>>       void __iomem *regs;
>> -    int ret;
>>         efuse = devm_kzalloc(dev, sizeof(*efuse), GFP_KERNEL);
>>       if (!efuse)
>> @@ -161,20 +155,10 @@ static int jz4780_efuse_probe(struct 
>> platform_device *pdev)
>>       if (IS_ERR(efuse->map))
>>           return PTR_ERR(efuse->map);
>>   -    efuse->clk = devm_clk_get(&pdev->dev, NULL);
>> +    efuse->clk = devm_clk_get_enabled(&pdev->dev, NULL);
>>       if (IS_ERR(efuse->clk))
>>           return PTR_ERR(efuse->clk);
>>   -    ret = clk_prepare_enable(efuse->clk);
>> -    if (ret < 0)
>> -        return ret;
>> -
>> -    ret = devm_add_action_or_reset(&pdev->dev,
>> -                       clk_disable_unprepare_helper,
>> -                       efuse->clk);
>> -    if (ret < 0)
>> -        return ret;
>> -
>>       clk_rate = clk_get_rate(efuse->clk);
>>         efuse->dev = dev;
>