torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

iio: adc: rockchip_saradc: Make use of devm_clk_get_enabled

Browse Source 
Use devm_clk_get_enabled() to avoid manually disabling the
clock.

Signed-off-by: Shreeya Patel <shreeya.patel@collabora.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230603185340.13838-4-shreeya.patel@collabora.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Shreeya Patel 2023-06-04 00:23:35 +05:30 committed by Jonathan Cameron
parent 757953f8ec
commit 97ad10bb29
1 changed files with 8 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/iio/adc/rockchip_saradc.c
View File

@ -346,20 +346,6 @@ static void rockchip_saradc_reset_controller(struct reset_control *reset)
reset_control_deassert(reset); reset_control_deassert(reset);
} }
static void rockchip_saradc_clk_disable(void *data)
{
struct rockchip_saradc *info = data;
clk_disable_unprepare(info->clk);
}
static void rockchip_saradc_pclk_disable(void *data)
{
struct rockchip_saradc *info = data;
clk_disable_unprepare(info->pclk);
}
static void rockchip_saradc_regulator_disable(void *data) static void rockchip_saradc_regulator_disable(void *data)
{ {
struct rockchip_saradc *info = data; struct rockchip_saradc *info = data;
@ -493,16 +479,6 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
return ret; return ret;
} }
info->pclk = devm_clk_get(&pdev->dev, "apb_pclk");
if (IS_ERR(info->pclk))
return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk),
"failed to get pclk\n");
info->clk = devm_clk_get(&pdev->dev, "saradc");
if (IS_ERR(info->clk))
return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
"failed to get adc clock\n");
info->vref = devm_regulator_get(&pdev->dev, "vref"); info->vref = devm_regulator_get(&pdev->dev, "vref");
if (IS_ERR(info->vref)) if (IS_ERR(info->vref))
return dev_err_probe(&pdev->dev, PTR_ERR(info->vref), return dev_err_probe(&pdev->dev, PTR_ERR(info->vref),
@ -540,31 +516,15 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
info->uv_vref = ret; info->uv_vref = ret;
ret = clk_prepare_enable(info->pclk); info->pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk");
if (ret < 0) { if (IS_ERR(info->pclk))
dev_err(&pdev->dev, "failed to enable pclk\n"); return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk),
return ret; "failed to get pclk\n");
}
ret = devm_add_action_or_reset(&pdev->dev,
rockchip_saradc_pclk_disable, info);
if (ret) {
dev_err(&pdev->dev, "failed to register devm action, %d\n",
ret);
return ret;
}
ret = clk_prepare_enable(info->clk); info->clk = devm_clk_get_enabled(&pdev->dev, "saradc");
if (ret < 0) { if (IS_ERR(info->clk))
dev_err(&pdev->dev, "failed to enable converter clock\n"); return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
return ret; "failed to get adc clock\n");
}
ret = devm_add_action_or_reset(&pdev->dev,
rockchip_saradc_clk_disable, info);
if (ret) {
dev_err(&pdev->dev, "failed to register devm action, %d\n",
ret);
return ret;
}
platform_set_drvdata(pdev, indio_dev); platform_set_drvdata(pdev, indio_dev);