[patch] [media] em28xx-cards: don't print a misleading message

[patch] [media] em28xx-cards: don't print a misleading message

[Dan Carpenter]

There were some missing curly braces so it always says that the transfer
mode changed even if it didn't.  Also the indenting uses spaces instead
of tabs.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 4d97a76cc3b0..e8eedd35eea5 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3329,10 +3329,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
 	/* Select USB transfer types to use */
 	if (has_video) {
-	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
-		dev->analog_xfer_bulk = 1;
-		em28xx_info("analog set to %s mode.\n",
-			    dev->analog_xfer_bulk ? "bulk" : "isoc");
+		if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk)) {
+			dev->analog_xfer_bulk = 1;
+			em28xx_info("analog set to %s mode.\n",
+				    dev->analog_xfer_bulk ? "bulk" : "isoc");
+		}
 	}
 	if (has_dvb) {
 	    if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))

Re: [patch] [media] em28xx-cards: don't print a misleading message

[Frank Schäfer]

Am 17.02.2014 21:04, schrieb Dan Carpenter:
> There were some missing curly braces so it always says that the transfer
> mode changed even if it didn't.

It's not a transfer mode change, it's the initial selection (which never
changes).
The intention of this section is to print which interface (type) is
choosen for analog video.
The same is done for digital video (DVB) a few lines later.
I think we should just switch from info to debug level.

>   Also the indenting uses spaces instead
> of tabs.
Yes, indenting is wrong and that's what causes the confusion here. ;-)

>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index 4d97a76cc3b0..e8eedd35eea5 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -3329,10 +3329,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
>  
>  	/* Select USB transfer types to use */
>  	if (has_video) {
> -	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
> -		dev->analog_xfer_bulk = 1;
> -		em28xx_info("analog set to %s mode.\n",
> -			    dev->analog_xfer_bulk ? "bulk" : "isoc");
> +		if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk)) {
> +			dev->analog_xfer_bulk = 1;
> +			em28xx_info("analog set to %s mode.\n",
> +				    dev->analog_xfer_bulk ? "bulk" : "isoc");
Now you will never hit the "isoc" path.

Regards,
Frank

> +		}
>  	}
>  	if (has_dvb) {
>  	    if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch] [media] em28xx-cards: don't print a misleading message

[Dan Carpenter]

Thank you so much for the review.  I should have noticed that myself...
I will send a patch to correct the indenting instead.

regards,
dan carpenter

[patch v2] [patch] [media] em28xx-cards: remove a wrong indent level

[Dan Carpenter]

This code is correct but the indenting is wrong and triggers a static
checker warning "add curly braces?".

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: in v1 I added curly braces.

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 4d97a76cc3b0..33f06ffec4b2 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3331,8 +3331,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 	if (has_video) {
 	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
 		dev->analog_xfer_bulk = 1;
-		em28xx_info("analog set to %s mode.\n",
-			    dev->analog_xfer_bulk ? "bulk" : "isoc");
+	    em28xx_info("analog set to %s mode.\n",
+			dev->analog_xfer_bulk ? "bulk" : "isoc");
 	}
 	if (has_dvb) {
 	    if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))

Re: [patch v2] [patch] [media] em28xx-cards: remove a wrong indent level

[Frank Schäfer]

Am 05.03.2014 12:09, schrieb Dan Carpenter:
> This code is correct but the indenting is wrong and triggers a static
> checker warning "add curly braces?".
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> v2: in v1 I added curly braces.
>
> diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> index 4d97a76cc3b0..33f06ffec4b2 100644
> --- a/drivers/media/usb/em28xx/em28xx-cards.c
> +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> @@ -3331,8 +3331,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
>  	if (has_video) {
>  	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
>  		dev->analog_xfer_bulk = 1;
> -		em28xx_info("analog set to %s mode.\n",
> -			    dev->analog_xfer_bulk ? "bulk" : "isoc");
> +	    em28xx_info("analog set to %s mode.\n",
> +			dev->analog_xfer_bulk ? "bulk" : "isoc");

Instead of moving em28xx_info(...) to the left the if section needs to
be moved to the right:

- 	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
- 		dev->analog_xfer_bulk = 1;
+ 		if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
+ 			dev->analog_xfer_bulk = 1;

While you are at it, could you also do fix the indention in the next
paragraph ?
Thanks !

Regards,
Frank

>  	}
>  	if (has_dvb) {
>  	    if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch v2] [patch] [media] em28xx-cards: remove a wrong indent level

[Dan Carpenter]

On Fri, Mar 07, 2014 at 05:46:28PM +0100, Frank Schäfer wrote:
> 
> Am 05.03.2014 12:09, schrieb Dan Carpenter:
> > This code is correct but the indenting is wrong and triggers a static
> > checker warning "add curly braces?".
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > v2: in v1 I added curly braces.
> >
> > diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
> > index 4d97a76cc3b0..33f06ffec4b2 100644
> > --- a/drivers/media/usb/em28xx/em28xx-cards.c
> > +++ b/drivers/media/usb/em28xx/em28xx-cards.c
> > @@ -3331,8 +3331,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
> >  	if (has_video) {
> >  	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
> >  		dev->analog_xfer_bulk = 1;
> > -		em28xx_info("analog set to %s mode.\n",
> > -			    dev->analog_xfer_bulk ? "bulk" : "isoc");
> > +	    em28xx_info("analog set to %s mode.\n",
> > +			dev->analog_xfer_bulk ? "bulk" : "isoc");
> 
> Instead of moving em28xx_info(...) to the left the if section needs to
> be moved to the right:
> 
> - 	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
> - 		dev->analog_xfer_bulk = 1;
> + 		if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
> + 			dev->analog_xfer_bulk = 1;

Yes.  I'd happy to.

> 
> While you are at it, could you also do fix the indention in the next
> paragraph ?

The next paragraph is almost identical but my static checker was
ignoring the curly braces because of the blank line.  I'll modify to
complain about that as well.

I'll resend.  Thanks for the review.

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[patch v3] [media] em28xx-cards: fix indenting in probe()

[Dan Carpenter]

There was a mix of 4 space and tab indenting here which was confusing.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v3: Just fix all the surrounding indents as well.
v2: At first I thought the code was buggy and was missing curly braces
    but it was just the indenting which was confusing.

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 50aa5a5..3744766 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -3416,14 +3416,14 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 
 	/* Select USB transfer types to use */
 	if (has_video) {
-	    if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
-		dev->analog_xfer_bulk = 1;
-	    em28xx_info("analog set to %s mode.\n",
-			dev->analog_xfer_bulk ? "bulk" : "isoc");
+		if (!dev->analog_ep_isoc || (try_bulk && dev->analog_ep_bulk))
+			dev->analog_xfer_bulk = 1;
+		em28xx_info("analog set to %s mode.\n",
+			    dev->analog_xfer_bulk ? "bulk" : "isoc");
 	}
 	if (has_dvb) {
-	    if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))
-		dev->dvb_xfer_bulk = 1;
+		if (!dev->dvb_ep_isoc || (try_bulk && dev->dvb_ep_bulk))
+			dev->dvb_xfer_bulk = 1;
 
 		em28xx_info("dvb set to %s mode.\n",
 			    dev->dvb_xfer_bulk ? "bulk" : "isoc");