nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers
PATCH 1/1 nvmem: jz4780-efuse: Use devm_clk_get_enabled() helpers
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().
--- drivers/nvmem/jz4780-efuse.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
drivers/nvmem/jz4780-efuse.c +1 -17
@@ -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;
Signature · 1 line
2.45.2
Le 20/08/2024 à 12:23, Huan Yang a écrit :
Quoted 9 lines
The
devm_clk_get_enabled()helpers:
- calldevm_clk_get()
- callclk_prepare_enable()and register what is needed in order to callclk_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 <[email protected]>---
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
Quoted 49 lines
drivers/nvmem/jz4780-efuse.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)drivers/nvmem/jz4780-efuse.c +1
-17@@ -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;
Quoted 6 lines · Christophe JAILLET
Le 20/08/2024 à 12:23, Huan Yang a écrit :
Quoted 5 lines
The
devm_clk_get_enabled()helpers:
- calldevm_clk_get()
- callclk_prepare_enable()and register what is needed in order to callclk_disable_unprepare()when needed, as a managed resource.
Quoted 8 lines
Quoted 4 lines
This simplifies the code and avoids the calls to
clk_disable_unprepare().Signed-off-by Huan Yang <[email protected]>---
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
Quoted 53 lines
Just my 2c.
CJ
Quoted 47 lines
drivers/nvmem/jz4780-efuse.c| 18 +-----------------1 file changed, 1 insertion(+), 17 deletions(-)drivers/nvmem/jz4780-efuse.c +0
-4@@ -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;drivers/nvmem/jz4780-efuse.c +1
-10@@ -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;