diff mbox

[media] stk1160: Remove dead code from stk1160_i2c_read_reg()

Message ID alpine.LNX.2.00.0811091803320.23782@swampdragon.chaosbits.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jesper Juhl Nov. 9, 2008, 5:04 p.m. UTC
There are two checks for 'rc' being less than zero with no change to
'rc' between the two, so the second is just dead code - remove it.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
 drivers/media/usb/stk1160/stk1160-i2c.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Comments

Ezequiel Garcia Oct. 13, 2012, 3:54 a.m. UTC | #1
On Sun, Nov 9, 2008 at 2:04 PM, Jesper Juhl <jj@chaosbits.net> wrote:
> There are two checks for 'rc' being less than zero with no change to
> 'rc' between the two, so the second is just dead code - remove it.
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> ---
>  drivers/media/usb/stk1160/stk1160-i2c.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c
> index 176ac93..035cf8c 100644
> --- a/drivers/media/usb/stk1160/stk1160-i2c.c
> +++ b/drivers/media/usb/stk1160/stk1160-i2c.c
> @@ -117,9 +117,6 @@ static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 addr,
>                 return rc;
>
>         stk1160_read_reg(dev, STK1160_SBUSR_RD, value);
> -       if (rc < 0)
> -               return rc;
> -
>         return 0;
>  }
>

Thanks for doing this. Wouldn't you like to save stk1160_read_reg
return code to rc, instead of this?

    Ezequiel
--
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
Jesper Juhl Oct. 15, 2012, 6:26 p.m. UTC | #2
On Sat, 13 Oct 2012, Ezequiel Garcia wrote:

> On Sun, Nov 9, 2008 at 2:04 PM, Jesper Juhl <jj@chaosbits.net> wrote:
> > There are two checks for 'rc' being less than zero with no change to
> > 'rc' between the two, so the second is just dead code - remove it.
> >
> > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > ---
> >  drivers/media/usb/stk1160/stk1160-i2c.c |    3 ---
> >  1 files changed, 0 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c
> > index 176ac93..035cf8c 100644
> > --- a/drivers/media/usb/stk1160/stk1160-i2c.c
> > +++ b/drivers/media/usb/stk1160/stk1160-i2c.c
> > @@ -117,9 +117,6 @@ static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 addr,
> >                 return rc;
> >
> >         stk1160_read_reg(dev, STK1160_SBUSR_RD, value);
> > -       if (rc < 0)
> > -               return rc;
> > -
> >         return 0;
> >  }
> >
> 
> Thanks for doing this. Wouldn't you like to save stk1160_read_reg
> return code to rc, instead of this?
> 
Ahh yes, I guess I was too quick to just assume it was dead code. 
Looking at it again; what you suggest must have been the original 
intention. I'll cook up a new patch.

Thanks.
diff mbox

Patch

diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c
index 176ac93..035cf8c 100644
--- a/drivers/media/usb/stk1160/stk1160-i2c.c
+++ b/drivers/media/usb/stk1160/stk1160-i2c.c
@@ -117,9 +117,6 @@  static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 addr,
 		return rc;
 
 	stk1160_read_reg(dev, STK1160_SBUSR_RD, value);
-	if (rc < 0)
-		return rc;
-
 	return 0;
 }