| Message ID | 1541450716-25523-3-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/3] media: imx-pxp: Check the return value from clk_prepare_enable() | expand |
On Mon, 2018-11-05 at 18:45 -0200, Fabio Estevam wrote: > 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> > --- > Changes since v1: > - Newly introduced in this version > > drivers/media/platform/imx-pxp.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c > index b3700b8..1b765c9 100644 > --- 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); > return ret; > + } > > spin_lock_init(&dev->irqlock); This should be rebased onto the fixed 2/2 or squashed into it, but otherwise Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c index b3700b8..1b765c9 100644 --- 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); return ret; + } spin_lock_init(&dev->irqlock);
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> --- Changes since v1: - Newly introduced in this version drivers/media/platform/imx-pxp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)