Skip to contentSkip to conversation

remove dead code in bcm43xx_sysfs.c

PATCH In review Darren Jenkins\ 1 participant 3 messages Sep 7, 2006

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove dead code in bcm43xx_sysfs.c

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

net/wireless/bcm43xx/bcm43xx_sysfs.c renamed from net/wireless/bcm43xx/bcm43xx_sysfs.c.orig +1 -3
@@ -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,

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

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.

Quoted 26 lines · Darren Jenkins\

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

net/wireless/bcm43xx/bcm43xx_sysfs.c renamed from net/wireless/bcm43xx/bcm43xx_sysfs.c.orig +0 -1
@@ -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
 

net/wireless/bcm43xx/bcm43xx_sysfs.c static ssize_t bcm43xx_attr_preamble_sto · line 296

Quoted 10 lines
net/wireless/bcm43xx/bcm43xx_sysfs.c renamed from net/wireless/bcm43xx/bcm43xx_sysfs.c.orig +1 -2
 	bcm->short_preamble = !!value;
 
-	err = 0;
 	bcm43xx_unlock_irqsafe(bcm, flags);
 
-	return err ? err : count;
+	return count;
 }
 
 static DEVICE_ATTR(shortpreamble, 0644,

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw

PATCH 1/1 remove dead code in bcm43xx_sysfs.c

In reply to Darren Jenkins\

G'day people

Coverity CID 1160 & 1161

These are probably fixed in some external tree, but in case they are not, here is a patch

Compile tested with allyesconfig

Remove some dead cose from bcm43xx_sysfs.c in 2.6.18-rc6

net/wireless/bcm43xx/bcm43xx_sysfs.c renamed from net/wireless/bcm43xx/bcm43xx_sysfs.c.orig +2 -6
@@ -251,7 +251,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))
@@ -264,10 +263,9 @@ static ssize_t bcm43xx_attr_preamble_sho
 	else
 		count = snprintf(buf, PAGE_SIZE, "0 (Short Preamble disabled)\n");
 
-	err = 0;
 	bcm43xx_unlock_noirq(bcm);
 
-	return err ? err : count;
+	return count;
 }
 
 static ssize_t bcm43xx_attr_preamble_store(struct device *dev,
@@ -276,7 +274,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 +286,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,

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors