diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-03-14 20:56:39 +0100 |
|---|---|---|
| committer |   Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-03-18 15:43:46 -0700 |
| commit | 99a31adfb2ffbdc6a5cdcec4e119830cf4c19352 (patch) | |
| tree | 7d0f957bfd636c20dc280da5e45b22fdabf753b4 /drivers/remoteproc/imx_rproc.c | |
| parent | remoteproc: imx_rproc: Re-use existing error handling path in 'imx_rproc_probe()' (diff) | |
| download | wireguard-linux-99a31adfb2ffbdc6a5cdcec4e119830cf4c19352.tar.xz wireguard-linux-99a31adfb2ffbdc6a5cdcec4e119830cf4c19352.zip | |
remoteproc: imx_rproc: Slightly simplify code in 'imx_rproc_probe()'
We can return directly at the beginning of the function and save the 'err'
label.
We can also explicitly return 0 when the probe succeed.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc/imx_rproc.c')
| -rw-r--r-- | drivers/remoteproc/imx_rproc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 6d02ef62a626..54c07fd3f204 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -333,10 +333,8 @@ static int imx_rproc_probe(struct platform_device *pdev) /* set some other name then imx */ rproc = rproc_alloc(dev, "imx-rproc", &imx_rproc_ops, NULL, sizeof(*priv)); - if (!rproc) { - ret = -ENOMEM; - goto err; - } + if (!rproc) + return -ENOMEM; dcfg = of_device_get_match_data(dev); if (!dcfg) { @@ -381,13 +379,13 @@ static int imx_rproc_probe(struct platform_device *pdev) goto err_put_clk; } - return ret; + return 0; err_put_clk: clk_disable_unprepare(priv->clk); err_put_rproc: rproc_free(rproc); -err: + return ret; } |