Commit c03cae17 authored by Soren Brinkmann's avatar Soren Brinkmann Committed by Greg Kroah-Hartman

tty: xuartps: Use devm_kzalloc

Use the device managed interface for memory allocation, simplifying
error paths.
Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 991fc259
...@@ -949,27 +949,26 @@ static int xuartps_probe(struct platform_device *pdev) ...@@ -949,27 +949,26 @@ static int xuartps_probe(struct platform_device *pdev)
struct resource *res, *res2; struct resource *res, *res2;
struct xuartps *xuartps_data; struct xuartps *xuartps_data;
xuartps_data = kzalloc(sizeof(*xuartps_data), GFP_KERNEL); xuartps_data = devm_kzalloc(&pdev->dev, sizeof(*xuartps_data),
GFP_KERNEL);
if (!xuartps_data) if (!xuartps_data)
return -ENOMEM; return -ENOMEM;
xuartps_data->aperclk = devm_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); return PTR_ERR(xuartps_data->aperclk);
goto err_out_free;
} }
xuartps_data->refclk = devm_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); return PTR_ERR(xuartps_data->refclk);
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_free; return rc;
} }
rc = clk_prepare_enable(xuartps_data->refclk); rc = clk_prepare_enable(xuartps_data->refclk);
if (rc) { if (rc) {
...@@ -1020,8 +1019,6 @@ static int xuartps_probe(struct platform_device *pdev) ...@@ -1020,8 +1019,6 @@ static int xuartps_probe(struct platform_device *pdev)
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_free:
kfree(xuartps_data);
return rc; return rc;
} }
...@@ -1043,7 +1040,6 @@ static int xuartps_remove(struct platform_device *pdev) ...@@ -1043,7 +1040,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);
kfree(xuartps_data);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment