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>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 4469f2451a6f..9f44c99777a8 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1306,8 +1306,8 @@ static int init_max_rx_buff_len(u16 max_rx_buf_len,
                                 u16 __iomem *mrblr_register)
 {
         /* max_rx_buf_len value must be a multiple of 128 */
-        if ((max_rx_buf_len == 0)
-            || (max_rx_buf_len % UCC_GETH_MRBLR_ALIGNMENT))
+        if ((max_rx_buf_len == 0) ||
+            (max_rx_buf_len % UCC_GETH_MRBLR_ALIGNMENT))
                 return -EINVAL;
 
         out_be16(mrblr_register, max_rx_buf_len);
@@ -2159,8 +2159,8 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth)
         }
 
         if ((ug_info->numStationAddresses !=
-             UCC_GETH_NUM_OF_STATION_ADDRESSES_1)
-            && ug_info->rxExtendedFiltering) {
+             UCC_GETH_NUM_OF_STATION_ADDRESSES_1) &&
+            ug_info->rxExtendedFiltering) {
                 if (netif_msg_probe(ugeth))
                         ugeth_err("%s: Number of station addresses greater than 1 "
                                   "not allowed in extended parsing mode.",
@@ -2284,9 +2284,9 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
              UCC_GETH_NUM_OF_STATION_ADDRESSES_1);
 
         ugeth->rx_extended_features = ugeth->rx_non_dynamic_extended_features ||
-            (ug_info->vlanOperationTagged != UCC_GETH_VLAN_OPERATION_TAGGED_NOP)
-            || (ug_info->vlanOperationNonTagged !=
-                UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
+                (ug_info->vlanOperationTagged != UCC_GETH_VLAN_OPERATION_TAGGED_NOP) ||
+                (ug_info->vlanOperationNonTagged !=
+                 UCC_GETH_VLAN_OPERATION_NON_TAGGED_NOP);
 
         init_default_reg_vals(&uf_regs->upsmr,
                               &ug_regs->maccfg1, &ug_regs->maccfg2);
@@ -2987,11 +2987,11 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
         ugeth->p_init_enet_param_shadow->rgftgfrxglobal |=
             ugeth->rx_glbl_pram_offset | ug_info->riscRx;
         if ((ug_info->largestexternallookupkeysize !=
-             QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_NONE)
-            && (ug_info->largestexternallookupkeysize !=
-                QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_8_BYTES)
-            && (ug_info->largestexternallookupkeysize !=
-                QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {
+             QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_NONE) &&
+            (ug_info->largestexternallookupkeysize !=
+             QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_8_BYTES) &&
+            (ug_info->largestexternallookupkeysize !=
+             QE_FLTR_LARGEST_EXTERNAL_TABLE_LOOKUP_KEY_SIZE_16_BYTES)) {
                 if (netif_msg_ifup(ugeth))
                         ugeth_err("%s: Invalid largest External Lookup Key Size.",
                                   __func__);