watchdog: rtd119x: Use devm_clk_get_enabled() helper
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 and avoids the need of a dedicated function used with devm_add_action_or_reset(). Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/14b521b821279bc5111dc80b55d0936c5767c737.1672418470.git.christophe.jaillet@wanadoo.fr Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Родитель
f3a0dd6489
Коммит
6cc0768ba6
|
@ -94,16 +94,10 @@ static const struct of_device_id rtd119x_wdt_dt_ids[] = {
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
static void rtd119x_clk_disable_unprepare(void *data)
|
|
||||||
{
|
|
||||||
clk_disable_unprepare(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int rtd119x_wdt_probe(struct platform_device *pdev)
|
static int rtd119x_wdt_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct rtd119x_watchdog_device *data;
|
struct rtd119x_watchdog_device *data;
|
||||||
int ret;
|
|
||||||
|
|
||||||
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
||||||
if (!data)
|
if (!data)
|
||||||
|
@ -113,18 +107,10 @@ static int rtd119x_wdt_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(data->base))
|
if (IS_ERR(data->base))
|
||||||
return PTR_ERR(data->base);
|
return PTR_ERR(data->base);
|
||||||
|
|
||||||
data->clk = devm_clk_get(dev, NULL);
|
data->clk = devm_clk_get_enabled(dev, NULL);
|
||||||
if (IS_ERR(data->clk))
|
if (IS_ERR(data->clk))
|
||||||
return PTR_ERR(data->clk);
|
return PTR_ERR(data->clk);
|
||||||
|
|
||||||
ret = clk_prepare_enable(data->clk);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
ret = devm_add_action_or_reset(dev, rtd119x_clk_disable_unprepare,
|
|
||||||
data->clk);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
data->wdt_dev.info = &rtd119x_wdt_info;
|
data->wdt_dev.info = &rtd119x_wdt_info;
|
||||||
data->wdt_dev.ops = &rtd119x_wdt_ops;
|
data->wdt_dev.ops = &rtd119x_wdt_ops;
|
||||||
data->wdt_dev.timeout = 120;
|
data->wdt_dev.timeout = 120;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче