| Message ID | 20210319164148.199192-17-jacopo+renesas@jmondi.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: gmsl: Reliability improvement | expand |
Hi Jacopo, Thank you for the patch. On Fri, Mar 19, 2021 at 05:41:45PM +0100, Jacopo Mondi wrote: > During the camera module initialization the image sensor PID is read to > verify it can correctly be identified. The current implementation is > rather confused and uses a loop implemented with a label and a goto. > > Replace it with a more compact for() loop. > > No functional changes intended. > > Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > --- > drivers/media/i2c/rdacm20.c | 29 +++++++++++++---------------- > 1 file changed, 13 insertions(+), 16 deletions(-) > > diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c > index 7bdcfafa6c10..760705dd2918 100644 > --- a/drivers/media/i2c/rdacm20.c > +++ b/drivers/media/i2c/rdacm20.c > @@ -59,6 +59,8 @@ > */ > #define OV10635_PIXEL_RATE (44000000) > > +#define OV10635_PID_TIMEOUT 3 > + > static const struct ov10635_reg { > u16 reg; > u8 val; > @@ -438,7 +440,7 @@ static int rdacm20_get_fmt(struct v4l2_subdev *sd, > static int rdacm20_init(struct v4l2_subdev *sd, unsigned int val) > { > struct rdacm20_device *dev = sd_to_rdacm20(sd); > - unsigned int retry = 3; > + unsigned int i; > int ret; > > /* > @@ -478,23 +480,18 @@ static int rdacm20_init(struct v4l2_subdev *sd, unsigned int val) > return ret; > usleep_range(10000, 15000); > > -again: > - ret = ov10635_read16(dev, OV10635_PID); > - if (ret < 0) { > - if (retry--) > - goto again; > + for (i = 0; i < OV10635_PID_TIMEOUT; ++i) { As commented on a previous patch, this macro is used here only, I would have made it local. > + ret = ov10635_read16(dev, OV10635_PID); > + if (ret == OV10635_VERSION) > + break; > + else if (ret >= 0) > + /* Sometimes we get a successful read but a wrong ID. */ > + dev_dbg(dev->dev, "OV10635 ID mismatch (%d)\n", ret); > > - dev_err(dev->dev, "OV10635 ID read failed (%d)\n", > - ret); > - return -ENXIO; > + usleep_range(1000, 2000); > } > - > - if (ret != OV10635_VERSION) { > - if (retry--) > - goto again; > - > - dev_err(dev->dev, "OV10635 ID mismatch (0x%04x)\n", > - ret); Blank line ? > + if (i == OV10635_PID_TIMEOUT) { > + dev_err(dev->dev, "OV10635 ID read failed (%d)\n", ret); > return -ENXIO; > } >
diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c index 7bdcfafa6c10..760705dd2918 100644 --- a/drivers/media/i2c/rdacm20.c +++ b/drivers/media/i2c/rdacm20.c @@ -59,6 +59,8 @@ */ #define OV10635_PIXEL_RATE (44000000) +#define OV10635_PID_TIMEOUT 3 + static const struct ov10635_reg { u16 reg; u8 val; @@ -438,7 +440,7 @@ static int rdacm20_get_fmt(struct v4l2_subdev *sd, static int rdacm20_init(struct v4l2_subdev *sd, unsigned int val) { struct rdacm20_device *dev = sd_to_rdacm20(sd); - unsigned int retry = 3; + unsigned int i; int ret; /* @@ -478,23 +480,18 @@ static int rdacm20_init(struct v4l2_subdev *sd, unsigned int val) return ret; usleep_range(10000, 15000); -again: - ret = ov10635_read16(dev, OV10635_PID); - if (ret < 0) { - if (retry--) - goto again; + for (i = 0; i < OV10635_PID_TIMEOUT; ++i) { + ret = ov10635_read16(dev, OV10635_PID); + if (ret == OV10635_VERSION) + break; + else if (ret >= 0) + /* Sometimes we get a successful read but a wrong ID. */ + dev_dbg(dev->dev, "OV10635 ID mismatch (%d)\n", ret); - dev_err(dev->dev, "OV10635 ID read failed (%d)\n", - ret); - return -ENXIO; + usleep_range(1000, 2000); } - - if (ret != OV10635_VERSION) { - if (retry--) - goto again; - - dev_err(dev->dev, "OV10635 ID mismatch (0x%04x)\n", - ret); + if (i == OV10635_PID_TIMEOUT) { + dev_err(dev->dev, "OV10635 ID read failed (%d)\n", ret); return -ENXIO; }