From patchwork Mon Oct 15 22:52:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 1597091 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7B6DEDFB34 for ; Mon, 15 Oct 2012 22:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528Ab2JOWw3 (ORCPT ); Mon, 15 Oct 2012 18:52:29 -0400 Received: from 1010ds2-suoe.0.fullrate.dk ([90.184.90.115]:20679 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752930Ab2JOWw2 (ORCPT ); Mon, 15 Oct 2012 18:52:28 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id D89289403D; Tue, 16 Oct 2012 00:52:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id CB7DB9403B; Tue, 16 Oct 2012 00:52:26 +0200 (CEST) Date: Tue, 16 Oct 2012 00:52:26 +0200 (CEST) From: Jesper Juhl To: Ezequiel Garcia cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] stk1160: Check return value of stk1160_read_reg() in stk1160_i2c_read_reg() In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Mon, 15 Oct 2012, Jesper Juhl wrote: > On Sat, 13 Oct 2012, Ezequiel Garcia wrote: > > > On Sun, Nov 9, 2008 at 2:04 PM, Jesper Juhl 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 > > > --- > > > 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. > From: Jesper Juhl Date: Sat, 13 Oct 2012 00:16:37 +0200 Subject: [PATCH] [media] stk1160: Check return value of stk1160_read_reg() in stk1160_i2c_read_reg() Currently 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. The intention seems to have been to assign the return value of 'stk1160_read_reg()' to 'rc' before the (currently dead) second check and then test /that/. This patch does that. Signed-off-by: Jesper Juhl --- drivers/media/usb/stk1160/stk1160-i2c.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/stk1160/stk1160-i2c.c b/drivers/media/usb/stk1160/stk1160-i2c.c index 176ac93..a2370e4 100644 --- a/drivers/media/usb/stk1160/stk1160-i2c.c +++ b/drivers/media/usb/stk1160/stk1160-i2c.c @@ -116,10 +116,9 @@ static int stk1160_i2c_read_reg(struct stk1160 *dev, u8 addr, if (rc < 0) return rc; - stk1160_read_reg(dev, STK1160_SBUSR_RD, value); + rc = stk1160_read_reg(dev, STK1160_SBUSR_RD, value); if (rc < 0) return rc; - return 0; }