From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Darren Jenkins\\" Subject: Re: [KJ][Patch] remove dead code in bcm43xx_sysfs.c Date: Thu, 07 Sep 2006 17:33:22 +1000 Message-ID: <1157614403.22555.22.camel@localhost.localdomain> References: <1157614059.22555.19.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: mb@bu3sch.de, NetDev Return-path: Received: from wx-out-0506.google.com ([66.249.82.229]:61147 "EHLO wx-out-0506.google.com") by vger.kernel.org with ESMTP id S1751028AbWIGHdy (ORCPT ); Thu, 7 Sep 2006 03:33:54 -0400 Received: by wx-out-0506.google.com with SMTP id s14so145286wxc for ; Thu, 07 Sep 2006 00:33:53 -0700 (PDT) To: kernel Janitors In-Reply-To: <1157614059.22555.19.camel@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Sorry people I have done it again! Both Coverity CID 1160 and 1161 are for the same file. I will whip up a combined patch Darren J. On Thu, 2006-09-07 at 17:27 +1000, Darren Jenkins\ wrote: > G'day people, > > Coverity CID 1161 > > This is probably fixed in some external tree, but in case it isn't, here is a patch > > > Compile tested with allyesconfig > > > Remove some dead code from bcm43xx_sysfs.c in 2.6.18-rc6 > > Signed-off-by: Darren Jenkins > --- drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c.orig 2006-09-07 15:40:33.000000000 +1000 > +++ drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c 2006-09-07 15:42:02.000000000 +1000 > @@ -276,7 +276,6 @@ static ssize_t bcm43xx_attr_preamble_sto > { > struct bcm43xx_private *bcm = dev_to_bcm(dev); > unsigned long flags; > - int err; > int value; > > if (!capable(CAP_NET_ADMIN)) > @@ -289,10 +288,9 @@ static ssize_t bcm43xx_attr_preamble_sto > > bcm->short_preamble = !!value; > > - err = 0; > bcm43xx_unlock_irqsafe(bcm, flags); > > - return err ? err : count; > + return count; > } > > static DEVICE_ATTR(shortpreamble, 0644, >