@@ -334,24 +334,6 @@ static struct regmap *lan966x_init_regmap(struct platform_device *pdev,
334
334
return devm_regmap_init_mmio (& pdev -> dev , base , & regmap_config );
335
335
}
336
336
337
- static void lan966x_clk_disable (void * data )
338
- {
339
- struct lan966x_hwmon * hwmon = data ;
340
-
341
- clk_disable_unprepare (hwmon -> clk );
342
- }
343
-
344
- static int lan966x_clk_enable (struct device * dev , struct lan966x_hwmon * hwmon )
345
- {
346
- int ret ;
347
-
348
- ret = clk_prepare_enable (hwmon -> clk );
349
- if (ret )
350
- return ret ;
351
-
352
- return devm_add_action_or_reset (dev , lan966x_clk_disable , hwmon );
353
- }
354
-
355
337
static int lan966x_hwmon_probe (struct platform_device * pdev )
356
338
{
357
339
struct device * dev = & pdev -> dev ;
@@ -363,15 +345,11 @@ static int lan966x_hwmon_probe(struct platform_device *pdev)
363
345
if (!hwmon )
364
346
return - ENOMEM ;
365
347
366
- hwmon -> clk = devm_clk_get (dev , NULL );
348
+ hwmon -> clk = devm_clk_get_enabled (dev , NULL );
367
349
if (IS_ERR (hwmon -> clk ))
368
350
return dev_err_probe (dev , PTR_ERR (hwmon -> clk ),
369
351
"failed to get clock\n" );
370
352
371
- ret = lan966x_clk_enable (dev , hwmon );
372
- if (ret )
373
- return dev_err_probe (dev , ret , "failed to enable clock\n" );
374
-
375
353
hwmon -> clk_rate = clk_get_rate (hwmon -> clk );
376
354
377
355
hwmon -> regmap_pvt = lan966x_init_regmap (pdev , "pvt" );
0 commit comments