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/3c503.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/3c503.c')
-rw-r--r-- | drivers/net/3c503.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c index c71e12d05f6e..66e0323c1839 100644 --- a/drivers/net/3c503.c +++ b/drivers/net/3c503.c | |||
@@ -214,8 +214,8 @@ el2_probe1(struct net_device *dev, int ioaddr) | |||
214 | iobase_reg = inb(ioaddr+0x403); | 214 | iobase_reg = inb(ioaddr+0x403); |
215 | membase_reg = inb(ioaddr+0x404); | 215 | membase_reg = inb(ioaddr+0x404); |
216 | /* ASIC location registers should be 0 or have only a single bit set. */ | 216 | /* ASIC location registers should be 0 or have only a single bit set. */ |
217 | if ( (iobase_reg & (iobase_reg - 1)) | 217 | if ((iobase_reg & (iobase_reg - 1)) || |
218 | || (membase_reg & (membase_reg - 1))) { | 218 | (membase_reg & (membase_reg - 1))) { |
219 | retval = -ENODEV; | 219 | retval = -ENODEV; |
220 | goto out1; | 220 | goto out1; |
221 | } | 221 | } |
@@ -291,8 +291,8 @@ el2_probe1(struct net_device *dev, int ioaddr) | |||
291 | writel(0xba5eba5e, mem_base); | 291 | writel(0xba5eba5e, mem_base); |
292 | for (i = sizeof(test_val); i < EL2_MEMSIZE; i+=sizeof(test_val)) { | 292 | for (i = sizeof(test_val); i < EL2_MEMSIZE; i+=sizeof(test_val)) { |
293 | writel(test_val, mem_base + i); | 293 | writel(test_val, mem_base + i); |
294 | if (readl(mem_base) != 0xba5eba5e | 294 | if (readl(mem_base) != 0xba5eba5e || |
295 | || readl(mem_base + i) != test_val) { | 295 | readl(mem_base + i) != test_val) { |
296 | pr_warning("3c503: memory failure or memory address conflict.\n"); | 296 | pr_warning("3c503: memory failure or memory address conflict.\n"); |
297 | dev->mem_start = 0; | 297 | dev->mem_start = 0; |
298 | ei_status.name = "3c503-PIO"; | 298 | ei_status.name = "3c503-PIO"; |
@@ -397,9 +397,10 @@ el2_open(struct net_device *dev) | |||
397 | unsigned long cookie = probe_irq_on(); | 397 | unsigned long cookie = probe_irq_on(); |
398 | outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR); | 398 | outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR); |
399 | outb_p(0x00, E33G_IDCFR); | 399 | outb_p(0x00, E33G_IDCFR); |
400 | if (*irqp == probe_irq_off(cookie) /* It's a good IRQ line! */ | 400 | if (*irqp == probe_irq_off(cookie) && /* It's a good IRQ line! */ |
401 | && ((retval = request_irq(dev->irq = *irqp, | 401 | ((retval = request_irq(dev->irq = *irqp, |
402 | eip_interrupt, 0, dev->name, dev)) == 0)) | 402 | eip_interrupt, 0, |
403 | dev->name, dev)) == 0)) | ||
403 | break; | 404 | break; |
404 | } else { | 405 | } else { |
405 | if (retval != -EBUSY) | 406 | if (retval != -EBUSY) |