From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-bw0-f209.google.com ([209.85.218.209]:59895 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647Ab0C1L3T (ORCPT ); Sun, 28 Mar 2010 07:29:19 -0400 Date: Sun, 28 Mar 2010 14:29:09 +0300 From: Dan Carpenter To: Mauro Carvalho Chehab Cc: Dean Anderson , Laurent Pinchart , Mike Isely , =?iso-8859-1?Q?Andr=E9?= Goddard Rosa , linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] video/s255drv: cleanup. remove uneeded NULL check Message-ID: <20100328112909.GP5069@bicker> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-media-owner@vger.kernel.org List-ID: "dev" can never be NULL there so there is no need to check it. Also I made a couple of white space changes to the declaration of "dev". This eliminates a smatch warning about checking for NULL after a dereference. Signed-off-by: Dan Carpenter diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index fb742f1..e70af5d 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c @@ -2582,8 +2582,9 @@ error: /* disconnect routine. when board is removed physically or with rmmod */ static void s2255_disconnect(struct usb_interface *interface) { - struct s2255_dev *dev = NULL; + struct s2255_dev *dev; int i; + dprintk(1, "s2255: disconnect interface %p\n", interface); dev = usb_get_intfdata(interface); @@ -2602,11 +2603,9 @@ static void s2255_disconnect(struct usb_interface *interface) usb_set_intfdata(interface, NULL); mutex_unlock(&dev->open_lock); - if (dev) { - kref_put(&dev->kref, s2255_destroy); - dprintk(1, "s2255drv: disconnect\n"); - dev_info(&interface->dev, "s2255usb now disconnected\n"); - } + kref_put(&dev->kref, s2255_destroy); + dprintk(1, "s2255drv: disconnect\n"); + dev_info(&interface->dev, "s2255usb now disconnected\n"); } static struct usb_driver s2255_driver = {