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>
This commit is contained in:

committed by
David S. Miller

parent
3454f83583
commit
8e95a2026f
@@ -1942,8 +1942,8 @@ vortex_error(struct net_device *dev, int status)
|
||||
if (status & TxComplete) { /* Really "TxError" for us. */
|
||||
tx_status = ioread8(ioaddr + TxStatus);
|
||||
/* Presumably a tx-timeout. We must merely re-enable. */
|
||||
if (vortex_debug > 2
|
||||
|| (tx_status != 0x88 && vortex_debug > 0)) {
|
||||
if (vortex_debug > 2 ||
|
||||
(tx_status != 0x88 && vortex_debug > 0)) {
|
||||
pr_err("%s: Transmit error, Tx status register %2.2x.\n",
|
||||
dev->name, tx_status);
|
||||
if (tx_status == 0x82) {
|
||||
|
Reference in New Issue
Block a user