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>

2 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 76abed9a70b1..ae5f11c8fc13 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -167,10 +167,7 @@ static inline struct net_device *bpq_get_ax25_dev(struct net_device *dev)
 
 static inline int dev_is_ethdev(struct net_device *dev)
 {
-        return (
-                        dev->type == ARPHRD_ETHER
-                        && strncmp(dev->name, "dummy", 5)
-        );
+        return (dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5));
 }
 
 /* ------------------------------------------------------------------------ */
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 950f3bb21f9d..9ee76b42668f 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -331,8 +331,8 @@ static int __init dmascc_init(void)
                         for (i = 0; i < MAX_NUM_DEVS && io[i]; i++) {
                                 j = (io[i] -
                                      hw[h].io_region) / hw[h].io_delta;
-                                if (j >= 0 && j < hw[h].num_devs
-                                    && hw[h].io_region +
+                                if (j >= 0 && j < hw[h].num_devs &&
+                                    hw[h].io_region +
                                     j * hw[h].io_delta == io[i]) {
                                         base[j] = io[i];
                                 }
@@ -396,8 +396,8 @@ static int __init dmascc_init(void)
                                         t_val =
                                             inb(t1[i]) + (inb(t1[i]) << 8);
                                         /* Also check whether counter did wrap */
-                                        if (t_val == 0
-                                            || t_val > TMR_0_HZ / HZ * 10)
+                                        if (t_val == 0 ||
+                                            t_val > TMR_0_HZ / HZ * 10)
                                                 counting[i] = 0;
                                         delay[i] = jiffies - start[i];
                                 }