aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arcnet/arc-rimi.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/arcnet/arc-rimi.c
parent3454f835837609d60b29a266e3bd9d701073b060 (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/arcnet/arc-rimi.c')
-rw-r--r--drivers/net/arcnet/arc-rimi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index c5b988140a91..e6afab2455b1 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -174,9 +174,9 @@ static int __init arcrimi_found(struct net_device *dev)
174 * 2k (or there are no mirrors at all) but on some, it's 4k. 174 * 2k (or there are no mirrors at all) but on some, it's 4k.
175 */ 175 */
176 mirror_size = MIRROR_SIZE; 176 mirror_size = MIRROR_SIZE;
177 if (readb(p) == TESTvalue 177 if (readb(p) == TESTvalue &&
178 && check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 178 check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 &&
179 && check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1) 179 check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1)
180 mirror_size = 2 * MIRROR_SIZE; 180 mirror_size = 2 * MIRROR_SIZE;
181 181
182 first_mirror = shmem - mirror_size; 182 first_mirror = shmem - mirror_size;