Skip to content

Commit

Permalink
[PATCH] bcm43xx: remove dead code in bcm43xx_sysfs.c
Browse files Browse the repository at this point in the history
Coverity CID 1160 & 1161
Remove some dead code from bcm43xx_sysfs.c in 2.6.18-rc6

Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and John W. Linville committed Sep 11, 2006
1 parent 87d2632 commit dca762d
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
char *buf)
{
struct bcm43xx_private *bcm = dev_to_bcm(dev);
int err;
ssize_t count = 0;

if (!capable(CAP_NET_ADMIN))
Expand All @@ -197,11 +196,10 @@ static ssize_t bcm43xx_attr_interfmode_show(struct device *dev,
default:
assert(0);
}
err = 0;

mutex_unlock(&bcm->mutex);

return err ? err : count;
return count;

}

Expand Down Expand Up @@ -259,7 +257,6 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
char *buf)
{
struct bcm43xx_private *bcm = dev_to_bcm(dev);
int err;
ssize_t count;

if (!capable(CAP_NET_ADMIN))
Expand All @@ -272,10 +269,9 @@ static ssize_t bcm43xx_attr_preamble_show(struct device *dev,
else
count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");

err = 0;
mutex_unlock(&bcm->mutex);

return err ? err : count;
return count;
}

static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
Expand All @@ -284,7 +280,6 @@ static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
{
struct bcm43xx_private *bcm = dev_to_bcm(dev);
unsigned long flags;
int err;
int value;

if (!capable(CAP_NET_ADMIN))
Expand All @@ -298,11 +293,10 @@ static ssize_t bcm43xx_attr_preamble_store(struct device *dev,

bcm->short_preamble = !!value;

err = 0;
spin_unlock_irqrestore(&bcm->irq_lock, flags);
mutex_unlock(&bcm->mutex);

return err ? err : count;
return count;
}

static DEVICE_ATTR(shortpreamble, 0644,
Expand Down

0 comments on commit dca762d

Please sign in to comment.