evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tty: xuartps: Use devm_clk_get()

Browse source 
Use the device managed interface for clocks, simplifying error paths.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Soren Brinkmann 2013-10-17 14:08:04 -07:00 • committed by Greg Kroah-Hartman
parent 731d9cae02
commit 991fc25936
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/tty/serial/xilinx_uartps.c
View file

@ -953,23 +953,23 @@ static int xuartps_probe(struct platform_device *pdev)
if (!xuartps_data) if (!xuartps_data)
return -ENOMEM; return -ENOMEM;
xuartps_data->aperclk = clk_get(&pdev->dev, "aper_clk"); xuartps_data->aperclk = devm_clk_get(&pdev->dev, "aper_clk");
if (IS_ERR(xuartps_data->aperclk)) { if (IS_ERR(xuartps_data->aperclk)) {
dev_err(&pdev->dev, "aper_clk clock not found.\n"); dev_err(&pdev->dev, "aper_clk clock not found.\n");
rc = PTR_ERR(xuartps_data->aperclk); rc = PTR_ERR(xuartps_data->aperclk);
goto err_out_free; goto err_out_free;
} }
xuartps_data->refclk = clk_get(&pdev->dev, "ref_clk"); xuartps_data->refclk = devm_clk_get(&pdev->dev, "ref_clk");
if (IS_ERR(xuartps_data->refclk)) { if (IS_ERR(xuartps_data->refclk)) {
dev_err(&pdev->dev, "ref_clk clock not found.\n"); dev_err(&pdev->dev, "ref_clk clock not found.\n");
rc = PTR_ERR(xuartps_data->refclk); rc = PTR_ERR(xuartps_data->refclk);
goto err_out_clk_put_aper; goto err_out_free;
} }
rc = clk_prepare_enable(xuartps_data->aperclk); rc = clk_prepare_enable(xuartps_data->aperclk);
if (rc) { if (rc) {
dev_err(&pdev->dev, "Unable to enable APER clock.\n"); dev_err(&pdev->dev, "Unable to enable APER clock.\n");
goto err_out_clk_put; goto err_out_free;
} }
rc = clk_prepare_enable(xuartps_data->refclk); rc = clk_prepare_enable(xuartps_data->refclk);
if (rc) { if (rc) {
@ -1020,10 +1020,6 @@ err_out_clk_disable:
clk_disable_unprepare(xuartps_data->refclk); clk_disable_unprepare(xuartps_data->refclk);
err_out_clk_dis_aper: err_out_clk_dis_aper:
clk_disable_unprepare(xuartps_data->aperclk); clk_disable_unprepare(xuartps_data->aperclk);
err_out_clk_put:
clk_put(xuartps_data->refclk);
err_out_clk_put_aper:
clk_put(xuartps_data->aperclk);
err_out_free: err_out_free:
kfree(xuartps_data); kfree(xuartps_data);
@ -1047,8 +1043,6 @@ static int xuartps_remove(struct platform_device *pdev)
port->mapbase = 0; port->mapbase = 0;
clk_disable_unprepare(xuartps_data->refclk); clk_disable_unprepare(xuartps_data->refclk);
clk_disable_unprepare(xuartps_data->aperclk); clk_disable_unprepare(xuartps_data->aperclk);
clk_put(xuartps_data->refclk);
clk_put(xuartps_data->aperclk);
kfree(xuartps_data); kfree(xuartps_data);
return rc; return rc;
} }