Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leds: lp55xx: Use devm_clk_get_enabled() helpers 

Simplify the code a bunch by using managed resource helpers.

Also, there is no need to save clk pointer anymore.

Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Huan Yang <link@vivo.com>
Link: https://lore.kernel.org/r/20240821013725.785956-1-link@vivo.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Huan Yang 2024-08-21 09:37:25 +08:00 committed by Lee Jones
parent 77b2b47598
commit 4968f67213
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/leds/leds-lp55xx-common.c
View File

@ -965,24 +965,16 @@ EXPORT_SYMBOL_GPL(lp55xx_update_bits);
bool lp55xx_is_extclk_used(struct lp55xx_chip *chip) bool lp55xx_is_extclk_used(struct lp55xx_chip *chip)
{ {
struct clk *clk; struct clk *clk;
int err;
clk = devm_clk_get(&chip->cl->dev, "32k_clk"); clk = devm_clk_get_enabled(&chip->cl->dev, "32k_clk");
if (IS_ERR(clk)) if (IS_ERR(clk))
goto use_internal_clk; goto use_internal_clk;
err = clk_prepare_enable(clk); if (clk_get_rate(clk) != LP55XX_CLK_32K)
if (err)
goto use_internal_clk; goto use_internal_clk;
if (clk_get_rate(clk) != LP55XX_CLK_32K) {
clk_disable_unprepare(clk);
goto use_internal_clk;
}
dev_info(&chip->cl->dev, "%dHz external clock used\n", LP55XX_CLK_32K); dev_info(&chip->cl->dev, "%dHz external clock used\n", LP55XX_CLK_32K);
chip->clk = clk;
return true; return true;
use_internal_clk: use_internal_clk:
@ -995,9 +987,6 @@ static void lp55xx_deinit_device(struct lp55xx_chip *chip)
{ {
struct lp55xx_platform_data *pdata = chip->pdata; struct lp55xx_platform_data *pdata = chip->pdata;
if (chip->clk)
clk_disable_unprepare(chip->clk);
if (pdata->enable_gpiod) if (pdata->enable_gpiod)
gpiod_set_value(pdata->enable_gpiod, 0); gpiod_set_value(pdata->enable_gpiod, 0);
} }

1
drivers/leds/leds-lp55xx-common.h
View File

@ -193,7 +193,6 @@ struct lp55xx_engine {
*/ */
struct lp55xx_chip { struct lp55xx_chip {
struct i2c_client *cl; struct i2c_client *cl;
struct clk *clk;
struct lp55xx_platform_data *pdata; struct lp55xx_platform_data *pdata;
struct mutex lock; /* lock for user-space interface */ struct mutex lock; /* lock for user-space interface */
int num_leds; int num_leds;