[PATCH]remove dead code in bcm43xx_sysfs.c (wireless-2.6)

[Larry Finger]

John,

Please queue this patch to remove dead code from bcm43xx-softmac in 
wireless-2.6. It was submitted
by Darren Jenkins based on a Coverity code checker report. I had to revise the patch for the 2.6.18 
locking model, and have tested it.

Thanks,

Larry

===============

Coverity CID 1160 & 1161
Remove some dead code from bcm43xx_sysfs.c in 2.6.18-rc6

Signed-off-by: Darren Jenkins <[EMAIL PROTECTED]>
Signed-off-by: Larry Finger <[EMAIL PROTECTED]>

=============

Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c
@@ -176,7 +176,6 @@ static ssize_t bcm43xx_attr_interfmode_s
                                            char *buf)
 {
        struct bcm43xx_private *bcm = dev_to_bcm(dev);
-       int err;
        ssize_t count = 0;

        if (!capable(CAP_NET_ADMIN))
@@ -197,11 +196,10 @@ static ssize_t bcm43xx_attr_interfmode_s
        default:
                assert(0);
        }
-       err = 0;

        mutex_unlock(&bcm->mutex);

-       return err ? err : count;
+       return count;

 }

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

        if (!capable(CAP_NET_ADMIN))
@@ -272,10 +269,9 @@ static ssize_t bcm43xx_attr_preamble_sho
        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,
@@ -284,7 +280,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))
@@ -298,11 +293,10 @@ static ssize_t bcm43xx_attr_preamble_sto

        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,


---------


-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html