* [patch] usb: pegasus: cleanup a couple conditions
@ 2011-12-23 10:44 Dan Carpenter
2011-12-23 16:15 ` Petko Manolov
2011-12-23 21:52 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2011-12-23 10:44 UTC (permalink / raw)
To: Petko Manolov; +Cc: Greg Kroah-Hartman, linux-usb, netdev, kernel-janitors
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>
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 908b427..5d99b8c 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);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch] usb: pegasus: cleanup a couple conditions
2011-12-23 10:44 [patch] usb: pegasus: cleanup a couple conditions Dan Carpenter
@ 2011-12-23 16:15 ` Petko Manolov
2011-12-23 21:52 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Petko Manolov @ 2011-12-23 16:15 UTC (permalink / raw)
To: Dan Carpenter
Cc: Petko Manolov, Greg Kroah-Hartman, linux-usb, netdev,
kernel-janitors
Once i thought 'loopback' may have other significant bits. Since it
doesn't look likely anymore i guess the patch is OK.
cheers,
Petko
On Fri, 23 Dec 2011, Dan Carpenter wrote:
> 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>
>
> diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
> index 908b427..5d99b8c 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);
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] usb: pegasus: cleanup a couple conditions
2011-12-23 10:44 [patch] usb: pegasus: cleanup a couple conditions Dan Carpenter
2011-12-23 16:15 ` Petko Manolov
@ 2011-12-23 21:52 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2011-12-23 21:52 UTC (permalink / raw)
To: dan.carpenter; +Cc: petkan, gregkh, linux-usb, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 23 Dec 2011 13:44:36 +0300
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-23 21:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-23 10:44 [patch] usb: pegasus: cleanup a couple conditions Dan Carpenter
2011-12-23 16:15 ` Petko Manolov
2011-12-23 21:52 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).