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/tlan.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/tlan.c')
-rw-r--r-- | drivers/net/tlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 16f23f84920b..fabaeffb3155 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -1755,8 +1755,8 @@ static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int ) | |||
1755 | ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) { | 1755 | ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) { |
1756 | tlphy_ctl |= TLAN_TC_SWAPOL; | 1756 | tlphy_ctl |= TLAN_TC_SWAPOL; |
1757 | TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl); | 1757 | TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl); |
1758 | } else if ( ( tlphy_sts & TLAN_TS_POLOK ) | 1758 | } else if ( ( tlphy_sts & TLAN_TS_POLOK ) && |
1759 | && ( tlphy_ctl & TLAN_TC_SWAPOL ) ) { | 1759 | ( tlphy_ctl & TLAN_TC_SWAPOL ) ) { |
1760 | tlphy_ctl &= ~TLAN_TC_SWAPOL; | 1760 | tlphy_ctl &= ~TLAN_TC_SWAPOL; |
1761 | TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl); | 1761 | TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl); |
1762 | } | 1762 | } |