diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/3c509.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r-- | drivers/net/3c509.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 8d4ce0964073..9d85efce5916 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -253,9 +253,9 @@ static int el3_isa_id_sequence(__be16 *phys_addr) | |||
253 | This check is needed in order not to register them twice. */ | 253 | This check is needed in order not to register them twice. */ |
254 | for (i = 0; i < el3_cards; i++) { | 254 | for (i = 0; i < el3_cards; i++) { |
255 | struct el3_private *lp = netdev_priv(el3_devs[i]); | 255 | struct el3_private *lp = netdev_priv(el3_devs[i]); |
256 | if (lp->type == EL3_PNP | 256 | if (lp->type == EL3_PNP && |
257 | && !memcmp(phys_addr, el3_devs[i]->dev_addr, | 257 | !memcmp(phys_addr, el3_devs[i]->dev_addr, |
258 | ETH_ALEN)) { | 258 | ETH_ALEN)) { |
259 | if (el3_debug > 3) | 259 | if (el3_debug > 3) |
260 | pr_debug("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n", | 260 | pr_debug("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n", |
261 | phys_addr[0] & 0xff, phys_addr[0] >> 8, | 261 | phys_addr[0] & 0xff, phys_addr[0] >> 8, |
@@ -835,8 +835,8 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
835 | #ifndef final_version | 835 | #ifndef final_version |
836 | { /* Error-checking code, delete someday. */ | 836 | { /* Error-checking code, delete someday. */ |
837 | ushort status = inw(ioaddr + EL3_STATUS); | 837 | ushort status = inw(ioaddr + EL3_STATUS); |
838 | if (status & 0x0001 /* IRQ line active, missed one. */ | 838 | if (status & 0x0001 && /* IRQ line active, missed one. */ |
839 | && inw(ioaddr + EL3_STATUS) & 1) { /* Make sure. */ | 839 | inw(ioaddr + EL3_STATUS) & 1) { /* Make sure. */ |
840 | pr_debug("%s: Missed interrupt, status then %04x now %04x" | 840 | pr_debug("%s: Missed interrupt, status then %04x now %04x" |
841 | " Tx %2.2x Rx %4.4x.\n", dev->name, status, | 841 | " Tx %2.2x Rx %4.4x.\n", dev->name, status, |
842 | inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS), | 842 | inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS), |