Commit e4818d3b authored by Markus Elfring's avatar Markus Elfring Committed by Abel Vesa
Browse files

clk: imx: scu: Use common error handling code in imx_clk_scu_alloc_dev() 



Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/01446ce9-c0e8-4467-8b2d-fd736bc5b8e4@web.de


Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
parent e1ed0b03

drivers/clk/imx/clk-scu.c

+10 −12
Original line number Diff line number Diff line
@@ -712,17 +712,13 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, 
	}



	ret = platform_device_add_data(pdev, &clk, sizeof(clk));

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	ret = driver_set_override(&pdev->dev, &pdev->driver_override,

				  "imx-scu-clk", strlen("imx-scu-clk"));

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	ret = imx_clk_scu_attach_pd(&pdev->dev, rsrc_id);

	if (ret)
@@ -730,13 +726,15 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, 
			name, ret);



	ret = platform_device_add(pdev);

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	/* For API backwards compatiblilty, simply return NULL for success */

	return NULL;



put_device:

	platform_device_put(pdev);

	return ERR_PTR(ret);

}



void imx_clk_scu_unregister(void)