| Message ID | cfe4c965074b5ecbe03830b05e038b4594c7b970.1661336689.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: (sparx5) Use devm_clk_get_enabled() helper | expand |
On Wed, Aug 24, 2022 at 12:25:13PM +0200, Christophe JAILLET wrote: > The devm_clk_get_enabled() helper: > - calls devm_clk_get() > - calls clk_prepare_enable() and registers what is needed in order to > call clk_disable_unprepare() when needed, as a managed resource. > > This simplifies the code, the error handling paths and avoid the need of > a dedicated function used with devm_add_action_or_reset(). > > Based on my test with allyesconfig, this reduces the .o size from: > text data bss dec hex filename > 2419 1472 0 3891 f33 drivers/hwmon/sparx5-temp.o > down to: > 2155 1472 0 3627 e2b drivers/hwmon/sparx5-temp.o > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Applied to hwmon-next. Thanks, Guenter > --- > devm_clk_get_enabled() is new and is part of 6.0-rc1 > --- > drivers/hwmon/sparx5-temp.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c > index 98be48e3a22a..04fd8505e5d6 100644 > --- a/drivers/hwmon/sparx5-temp.c > +++ b/drivers/hwmon/sparx5-temp.c > @@ -26,13 +26,6 @@ struct s5_hwmon { > struct clk *clk; > }; > > -static void s5_temp_clk_disable(void *data) > -{ > - struct clk *clk = data; > - > - clk_disable_unprepare(clk); > -} > - > static void s5_temp_enable(struct s5_hwmon *hwmon) > { > u32 val = readl(hwmon->base + TEMP_CFG); > @@ -113,7 +106,6 @@ static int s5_temp_probe(struct platform_device *pdev) > { > struct device *hwmon_dev; > struct s5_hwmon *hwmon; > - int ret; > > hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL); > if (!hwmon) > @@ -123,19 +115,10 @@ static int s5_temp_probe(struct platform_device *pdev) > if (IS_ERR(hwmon->base)) > return PTR_ERR(hwmon->base); > > - hwmon->clk = devm_clk_get(&pdev->dev, NULL); > + hwmon->clk = devm_clk_get_enabled(&pdev->dev, NULL); > if (IS_ERR(hwmon->clk)) > return PTR_ERR(hwmon->clk); > > - ret = clk_prepare_enable(hwmon->clk); > - if (ret) > - return ret; > - > - ret = devm_add_action_or_reset(&pdev->dev, s5_temp_clk_disable, > - hwmon->clk); > - if (ret) > - return ret; > - > s5_temp_enable(hwmon); > > hwmon_dev = devm_hwmon_device_register_with_info(&pdev->dev,
diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c index 98be48e3a22a..04fd8505e5d6 100644 --- a/drivers/hwmon/sparx5-temp.c +++ b/drivers/hwmon/sparx5-temp.c @@ -26,13 +26,6 @@ struct s5_hwmon { struct clk *clk; }; -static void s5_temp_clk_disable(void *data) -{ - struct clk *clk = data; - - clk_disable_unprepare(clk); -} - static void s5_temp_enable(struct s5_hwmon *hwmon) { u32 val = readl(hwmon->base + TEMP_CFG); @@ -113,7 +106,6 @@ static int s5_temp_probe(struct platform_device *pdev) { struct device *hwmon_dev; struct s5_hwmon *hwmon; - int ret; hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL); if (!hwmon) @@ -123,19 +115,10 @@ static int s5_temp_probe(struct platform_device *pdev) if (IS_ERR(hwmon->base)) return PTR_ERR(hwmon->base); - hwmon->clk = devm_clk_get(&pdev->dev, NULL); + hwmon->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(hwmon->clk)) return PTR_ERR(hwmon->clk); - ret = clk_prepare_enable(hwmon->clk); - if (ret) - return ret; - - ret = devm_add_action_or_reset(&pdev->dev, s5_temp_clk_disable, - hwmon->clk); - if (ret) - return ret; - s5_temp_enable(hwmon); hwmon_dev = devm_hwmon_device_register_with_info(&pdev->dev,
The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code, the error handling paths and avoid the need of a dedicated function used with devm_add_action_or_reset(). Based on my test with allyesconfig, this reduces the .o size from: text data bss dec hex filename 2419 1472 0 3891 f33 drivers/hwmon/sparx5-temp.o down to: 2155 1472 0 3627 e2b drivers/hwmon/sparx5-temp.o Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- devm_clk_get_enabled() is new and is part of 6.0-rc1 --- drivers/hwmon/sparx5-temp.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)