Subject: [PATCH v2 2/3] media: uvc_driver: fix assignment inside if condition

Fixes 'do not use assignment in if condition' errors issued by
scripts/checkpatch.pl on drivers/media/usb/uvc/uvc_driver.c

Signed-off-by: Pedro Guilherme Siqueira Moreira <[email protected]>
---
drivers/media/usb/uvc/uvc_driver.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index b591ad823c66..7b6c97ad3a41 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1174,7 +1174,8 @@ static int uvc_parse_control(struct uvc_device *dev)
buffer[1] != USB_DT_CS_INTERFACE)
goto next_descriptor;

- if ((ret = uvc_parse_standard_control(dev, buffer, buflen)) < 0)
+ ret = uvc_parse_standard_control(dev, buffer, buflen);
+ if (ret < 0)
return ret;

next_descriptor:
@@ -2213,7 +2214,8 @@ static int uvc_probe(struct usb_interface *intf,
usb_set_intfdata(intf, dev);

/* Initialize the interrupt URB. */
- if ((ret = uvc_status_init(dev)) < 0) {
+ ret = uvc_status_init(dev);
+ if (ret < 0) {
dev_info(&dev->udev->dev,
"Unable to initialize the status endpoint (%d), status interrupt will not be supported.\n",
ret);
--
2.38.1


2022-10-25 09:26:51

by Ricardo Ribalda

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] media: uvc_driver: fix assignment inside if condition

On Tue, 25 Oct 2022 at 07:08, Pedro Guilherme Siqueira Moreira
<[email protected]> wrote:
>
> Fixes 'do not use assignment in if condition' errors issued by
> scripts/checkpatch.pl on drivers/media/usb/uvc/uvc_driver.c
>
> Signed-off-by: Pedro Guilherme Siqueira Moreira <[email protected]>
Reviewed-by: Ricardo Ribalda <[email protected]>
> ---
> drivers/media/usb/uvc/uvc_driver.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index b591ad823c66..7b6c97ad3a41 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1174,7 +1174,8 @@ static int uvc_parse_control(struct uvc_device *dev)
> buffer[1] != USB_DT_CS_INTERFACE)
> goto next_descriptor;
>
> - if ((ret = uvc_parse_standard_control(dev, buffer, buflen)) < 0)
> + ret = uvc_parse_standard_control(dev, buffer, buflen);
> + if (ret < 0)
> return ret;
>
> next_descriptor:
> @@ -2213,7 +2214,8 @@ static int uvc_probe(struct usb_interface *intf,
> usb_set_intfdata(intf, dev);
>
> /* Initialize the interrupt URB. */
> - if ((ret = uvc_status_init(dev)) < 0) {
> + ret = uvc_status_init(dev);
> + if (ret < 0) {
> dev_info(&dev->udev->dev,
> "Unable to initialize the status endpoint (%d), status interrupt will not be supported.\n",
> ret);
> --
> 2.38.1
>


--
Ricardo Ribalda

2022-10-25 19:02:35

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH v2 2/3] media: uvc_driver: fix assignment inside if condition

On Tue, Oct 25, 2022 at 10:45:40AM +0200, Ricardo Ribalda wrote:
> On Tue, 25 Oct 2022 at 07:08, Pedro Guilherme Siqueira Moreira
> <[email protected]> wrote:
> >
> > Fixes 'do not use assignment in if condition' errors issued by
> > scripts/checkpatch.pl on drivers/media/usb/uvc/uvc_driver.c
> >
> > Signed-off-by: Pedro Guilherme Siqueira Moreira <[email protected]>
>
> Reviewed-by: Ricardo Ribalda <[email protected]>

Likewise, this looks good to me.

Reviewed-by: Laurent Pinchart <[email protected]>

> > ---
> > drivers/media/usb/uvc/uvc_driver.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> > index b591ad823c66..7b6c97ad3a41 100644
> > --- a/drivers/media/usb/uvc/uvc_driver.c
> > +++ b/drivers/media/usb/uvc/uvc_driver.c
> > @@ -1174,7 +1174,8 @@ static int uvc_parse_control(struct uvc_device *dev)
> > buffer[1] != USB_DT_CS_INTERFACE)
> > goto next_descriptor;
> >
> > - if ((ret = uvc_parse_standard_control(dev, buffer, buflen)) < 0)
> > + ret = uvc_parse_standard_control(dev, buffer, buflen);
> > + if (ret < 0)
> > return ret;
> >
> > next_descriptor:
> > @@ -2213,7 +2214,8 @@ static int uvc_probe(struct usb_interface *intf,
> > usb_set_intfdata(intf, dev);
> >
> > /* Initialize the interrupt URB. */
> > - if ((ret = uvc_status_init(dev)) < 0) {
> > + ret = uvc_status_init(dev);
> > + if (ret < 0) {
> > dev_info(&dev->udev->dev,
> > "Unable to initialize the status endpoint (%d), status interrupt will not be supported.\n",
> > ret);

--
Regards,

Laurent Pinchart