usb: pegasus: cleanup a couple conditions

PATCH Applied Dan Carpenter 3 participants 3 messages Dec 23, 2011

Subsystems (5)

Networking Network drivers Kernel janitors USB networking drivers +1 more subsystems

lore

Share & tools

lore

Dan Carpenter

author

2011-12-23 10:44 UTC #0 lore raw

PATCH 1/1 usb: pegasus: cleanup a couple conditions

We recently made loopback a bool type instead of an int, so the bitwise AND is redundent.

Signed-off-by Dan Carpenter <[email protected]>

drivers/net/usb/pegasus.c +2 -2

index 908b427..5d99b8c 100644
@@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus)
 	for (i = 0; i < REG_TIMEOUT; i++) {
 		get_registers(pegasus, EthCtrl1, 1, &data);
 		if (~data & 0x08) {
-			if (loopback & 1)
+			if (loopback)
 				break;
 			if (mii_mode && (pegasus->features & HAS_HOME_PNA))
 				set_register(pegasus, Gpio1, 0x34);

@@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
 		data[1] |= 0x10;	/* set 100 Mbps */
 	if (mii_mode)
 		data[1] = 0;
-	data[2] = (loopback & 1) ? 0x09 : 0x01;
+	data[2] = loopback ? 0x09 : 0x01;
 
 	memcpy(pegasus->eth_regs, data, sizeof(data));
 	ret = set_registers(pegasus, EthCtrl0, 3, data);

Petko Manolov

maintainer

2011-12-23 16:15 UTC #1 lore raw

Once i thought 'loopback' may have other significant bits. Since it doesn't look likely anymore i guess the patch is OK.

cheers,
Petko

Quoted 28 lines · Dan Carpenter

We recently made loopback a bool type instead of an int, so the bitwise AND is redundent.

Signed-off-by Dan Carpenter <[email protected]>

drivers/net/usb/pegasus.c +2 -2

index 908b427..5d99b8c 100644
@@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus)
 	for (i = 0; i < REG_TIMEOUT; i++) {
 		get_registers(pegasus, EthCtrl1, 1, &data);
 		if (~data & 0x08) {
-			if (loopback & 1)
+			if (loopback)
 				break;
 			if (mii_mode && (pegasus->features & HAS_HOME_PNA))
 				set_register(pegasus, Gpio1, 0x34);

@@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb)
 		data[1] |= 0x10;	/* set 100 Mbps */
 	if (mii_mode)
 		data[1] = 0;
-	data[2] = (loopback & 1) ? 0x09 : 0x01;
+	data[2] = loopback ? 0x09 : 0x01;
 
 	memcpy(pegasus->eth_regs, data, sizeof(data));
 	ret = set_registers(pegasus, EthCtrl0, 3, data);

David Miller

maintainer Applied

2011-12-23 21:52 UTC #2 lore raw

In reply to Dan Carpenter

From: Dan Carpenter <[email protected]>
Date: Fri, 23 Dec 2011 13:44:36 +0300

Quoted 4 lines

We recently made loopback a bool type instead of an int, so the bitwise AND is redundent.
Signed-off-by Dan Carpenter <[email protected]>

Applied.