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/lib8390.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/lib8390.c')
-rw-r--r-- | drivers/net/lib8390.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index 256119882b1e..57f25848fe80 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c | |||
@@ -464,8 +464,8 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) | |||
464 | ei_inb_p(e8390_base + EN0_ISR)); | 464 | ei_inb_p(e8390_base + EN0_ISR)); |
465 | 465 | ||
466 | /* !!Assumption!! -- we stay in page 0. Don't break this. */ | 466 | /* !!Assumption!! -- we stay in page 0. Don't break this. */ |
467 | while ((interrupts = ei_inb_p(e8390_base + EN0_ISR)) != 0 | 467 | while ((interrupts = ei_inb_p(e8390_base + EN0_ISR)) != 0 && |
468 | && ++nr_serviced < MAX_SERVICE) | 468 | ++nr_serviced < MAX_SERVICE) |
469 | { | 469 | { |
470 | if (!netif_running(dev)) { | 470 | if (!netif_running(dev)) { |
471 | printk(KERN_WARNING "%s: interrupt from stopped card\n", dev->name); | 471 | printk(KERN_WARNING "%s: interrupt from stopped card\n", dev->name); |
@@ -721,10 +721,10 @@ static void ei_receive(struct net_device *dev) | |||
721 | /* Check for bogosity warned by 3c503 book: the status byte is never | 721 | /* Check for bogosity warned by 3c503 book: the status byte is never |
722 | written. This happened a lot during testing! This code should be | 722 | written. This happened a lot during testing! This code should be |
723 | cleaned up someday. */ | 723 | cleaned up someday. */ |
724 | if (rx_frame.next != next_frame | 724 | if (rx_frame.next != next_frame && |
725 | && rx_frame.next != next_frame + 1 | 725 | rx_frame.next != next_frame + 1 && |
726 | && rx_frame.next != next_frame - num_rx_pages | 726 | rx_frame.next != next_frame - num_rx_pages && |
727 | && rx_frame.next != next_frame + 1 - num_rx_pages) { | 727 | rx_frame.next != next_frame + 1 - num_rx_pages) { |
728 | ei_local->current_page = rxing_page; | 728 | ei_local->current_page = rxing_page; |
729 | ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY); | 729 | ei_outb(ei_local->current_page-1, e8390_base+EN0_BOUNDARY); |
730 | dev->stats.rx_errors++; | 730 | dev->stats.rx_errors++; |