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, 24 insertions, 24 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index c86095eb5d9e..ddd704ae0188 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -257,18 +257,18 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         /* read which mode */
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
                 /* autonegotiation */
-                if (adapter->phy_write
-                    && adapter->phy_write(adapter,
-                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                          ecmd->autoneg) != 0)
+                if (adapter->phy_write &&
+                    adapter->phy_write(adapter,
+                                       NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
+                                       ecmd->autoneg) != 0)
                         return -EIO;
                 else
                         adapter->link_autoneg = ecmd->autoneg;
 
-                if (adapter->phy_read
-                    && adapter->phy_read(adapter,
-                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                         &status) != 0)
+                if (adapter->phy_read &&
+                    adapter->phy_read(adapter,
+                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                      &status) != 0)
                         return -EIO;
 
                 /* speed */
@@ -288,10 +288,10 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         netxen_clear_phy_duplex(status);
                 if (ecmd->duplex == DUPLEX_FULL)
                         netxen_set_phy_duplex(status);
-                if (adapter->phy_write
-                    && adapter->phy_write(adapter,
-                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                          *((int *)&status)) != 0)
+                if (adapter->phy_write &&
+                    adapter->phy_write(adapter,
+                                       NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                       *((int *)&status)) != 0)
                         return -EIO;
                 else {
                         adapter->link_speed = ecmd->speed;
@@ -442,10 +442,10 @@ static u32 netxen_nic_test_link(struct net_device *dev)
 
         /* read which mode */
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                if (adapter->phy_read
-                    && adapter->phy_read(adapter,
-                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                         &status) != 0)
+                if (adapter->phy_read &&
+                    adapter->phy_read(adapter,
+                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                      &status) != 0)
                         return -EIO;
                 else {
                         val = netxen_get_phy_link(status);
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 89bd5194e37a..2e364fee3cbb 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1936,10 +1936,10 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
                         return;
                 }
 
-                if (adapter->phy_read
-                    && adapter->phy_read(adapter,
-                             NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                             &status) == 0) {
+                if (adapter->phy_read &&
+                    adapter->phy_read(adapter,
+                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
+                                      &status) == 0) {
                         if (netxen_get_phy_link(status)) {
                                 switch (netxen_get_phy_speed(status)) {
                                 case 0:
@@ -1966,10 +1966,10 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
                                         adapter->link_duplex = -1;
                                         break;
                                 }
-                                if (adapter->phy_read
-                                    && adapter->phy_read(adapter,
-                                             NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                             &autoneg) != 0)
+                                if (adapter->phy_read &&
+                                    adapter->phy_read(adapter,
+                                                      NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
+                                                      &autoneg) != 0)
                                         adapter->link_autoneg = autoneg;
                         } else
                                 goto link_down;