media: imx-pxp: Improve pxp_soft_reset() error message

Improve the pxp_soft_reset() error message by moving it to the
caller function, associating it with a proper device and also
by displaying the error code.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c
index 986764de5616c0a20c0606cf8e9930d6f2bd47ce..b80d206f2b810ca75e167cf13a7f21de43a7c9e5 100644 (file)
--- a/drivers/media/platform/imx-pxp.c
+++ b/drivers/media/platform/imx-pxp.c
@@ -1619,10 +1619,8 @@ static int pxp_soft_reset(struct pxp_dev *dev)
 
        ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val,
                                 val & BM_PXP_CTRL_CLKGATE, 0, 100);
-       if (ret < 0) {
-               pr_err("PXP reset timeout\n");
+       if (ret < 0)
                return ret;
-       }
 
        writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR);
        writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR);
@@ -1675,8 +1673,10 @@ static int pxp_probe(struct platform_device *pdev)
                return ret;
 
        ret = pxp_soft_reset(dev);
-       if (ret < 0)
+       if (ret < 0) {
+               dev_err(&pdev->dev, "PXP reset timeout: %d\n", ret);
                goto err_clk;
+       }
 
        spin_lock_init(&dev->irqlock);