diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-12-23 00:44:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-23 16:51:18 -0500 |
| commit | 681f16232c49de06fb3683a8b128a95dbda9413c (patch) | |
| tree | bdf41763bec1b96ede660a5efca870d72ace2fce /drivers/net | |
| parent | 9d4dde5215779f4099730194ad30624fdba3d8b2 (diff) | |
| download | blackbird-obmc-linux-681f16232c49de06fb3683a8b128a95dbda9413c.tar.gz blackbird-obmc-linux-681f16232c49de06fb3683a8b128a95dbda9413c.zip | |
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>
Diffstat (limited to 'drivers/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) 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); |
