Skip to content

Commit 4968f67

Browse files
Huan Yanglag-linaro
authored andcommitted
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 <[email protected]> Signed-off-by: Huan Yang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 77b2b47 commit 4968f67

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

drivers/leds/leds-lp55xx-common.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -965,24 +965,16 @@ EXPORT_SYMBOL_GPL(lp55xx_update_bits);
965965
bool lp55xx_is_extclk_used(struct lp55xx_chip *chip)
966966
{
967967
struct clk *clk;
968-
int err;
969968

970-
clk = devm_clk_get(&chip->cl->dev, "32k_clk");
969+
clk = devm_clk_get_enabled(&chip->cl->dev, "32k_clk");
971970
if (IS_ERR(clk))
972971
goto use_internal_clk;
973972

974-
err = clk_prepare_enable(clk);
975-
if (err)
973+
if (clk_get_rate(clk) != LP55XX_CLK_32K)
976974
goto use_internal_clk;
977975

978-
if (clk_get_rate(clk) != LP55XX_CLK_32K) {
979-
clk_disable_unprepare(clk);
980-
goto use_internal_clk;
981-
}
982-
983976
dev_info(&chip->cl->dev, "%dHz external clock used\n", LP55XX_CLK_32K);
984977

985-
chip->clk = clk;
986978
return true;
987979

988980
use_internal_clk:
@@ -995,9 +987,6 @@ static void lp55xx_deinit_device(struct lp55xx_chip *chip)
995987
{
996988
struct lp55xx_platform_data *pdata = chip->pdata;
997989

998-
if (chip->clk)
999-
clk_disable_unprepare(chip->clk);
1000-
1001990
if (pdata->enable_gpiod)
1002991
gpiod_set_value(pdata->enable_gpiod, 0);
1003992
}

drivers/leds/leds-lp55xx-common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ struct lp55xx_engine {
193193
*/
194194
struct lp55xx_chip {
195195
struct i2c_client *cl;
196-
struct clk *clk;
197196
struct lp55xx_platform_data *pdata;
198197
struct mutex lock; /* lock for user-space interface */
199198
int num_leds;

0 commit comments

Comments
 (0)