diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-12-22 19:44:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-23 16:51:18 -0500 |
commit | 681f16232c49de06fb3683a8b128a95dbda9413c (patch) | |
tree | bdf41763bec1b96ede660a5efca870d72ace2fce | |
parent | 9d4dde5215779f4099730194ad30624fdba3d8b2 (diff) |
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 <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/pegasus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 908b42710399..5d99b8cacd7d 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus) | |||
517 | for (i = 0; i < REG_TIMEOUT; i++) { | 517 | for (i = 0; i < REG_TIMEOUT; i++) { |
518 | get_registers(pegasus, EthCtrl1, 1, &data); | 518 | get_registers(pegasus, EthCtrl1, 1, &data); |
519 | if (~data & 0x08) { | 519 | if (~data & 0x08) { |
520 | if (loopback & 1) | 520 | if (loopback) |
521 | break; | 521 | break; |
522 | if (mii_mode && (pegasus->features & HAS_HOME_PNA)) | 522 | if (mii_mode && (pegasus->features & HAS_HOME_PNA)) |
523 | set_register(pegasus, Gpio1, 0x34); | 523 | set_register(pegasus, Gpio1, 0x34); |
@@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) | |||
561 | data[1] |= 0x10; /* set 100 Mbps */ | 561 | data[1] |= 0x10; /* set 100 Mbps */ |
562 | if (mii_mode) | 562 | if (mii_mode) |
563 | data[1] = 0; | 563 | data[1] = 0; |
564 | data[2] = (loopback & 1) ? 0x09 : 0x01; | 564 | data[2] = loopback ? 0x09 : 0x01; |
565 | 565 | ||
566 | memcpy(pegasus->eth_regs, data, sizeof(data)); | 566 | memcpy(pegasus->eth_regs, data, sizeof(data)); |
567 | ret = set_registers(pegasus, EthCtrl0, 3, data); | 567 | ret = set_registers(pegasus, EthCtrl0, 3, data); |