| Message ID | 1507718924-127469-1-git-send-email-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Oct 11, 2017 at 10:48:44AM +0000, Wei Yongjun wrote: > In case of error, the function devm_ioremap() returns NULL pointer > not ERR_PTR(). The IS_ERR() test in the return value check should > be replaced with NULL test. > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/remoteproc/imx_rproc.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 612d914..fc38916 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -269,10 +269,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, > > priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, > att->sa, att->size); > - if (IS_ERR(priv->mem[b].cpu_addr)) { > + if (!priv->mem[b].cpu_addr) { > dev_err(dev, "devm_ioremap_resource failed\n"); > - err = PTR_ERR(priv->mem[b].cpu_addr); > - return err; > + return -ENOMEM; > } > priv->mem[b].sys_addr = att->sa; > priv->mem[b].size = att->size; > > Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 612d914..fc38916 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -269,10 +269,9 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, att->sa, att->size); - if (IS_ERR(priv->mem[b].cpu_addr)) { + if (!priv->mem[b].cpu_addr) { dev_err(dev, "devm_ioremap_resource failed\n"); - err = PTR_ERR(priv->mem[b].cpu_addr); - return err; + return -ENOMEM; } priv->mem[b].sys_addr = att->sa; priv->mem[b].size = att->size;
In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/remoteproc/imx_rproc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html