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
@@ -253,9 +253,9 @@ static int el3_isa_id_sequence(__be16 *phys_addr)
|
||||
This check is needed in order not to register them twice. */
|
||||
for (i = 0; i < el3_cards; i++) {
|
||||
struct el3_private *lp = netdev_priv(el3_devs[i]);
|
||||
if (lp->type == EL3_PNP
|
||||
&& !memcmp(phys_addr, el3_devs[i]->dev_addr,
|
||||
ETH_ALEN)) {
|
||||
if (lp->type == EL3_PNP &&
|
||||
!memcmp(phys_addr, el3_devs[i]->dev_addr,
|
||||
ETH_ALEN)) {
|
||||
if (el3_debug > 3)
|
||||
pr_debug("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n",
|
||||
phys_addr[0] & 0xff, phys_addr[0] >> 8,
|
||||
@@ -835,8 +835,8 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
#ifndef final_version
|
||||
{ /* Error-checking code, delete someday. */
|
||||
ushort status = inw(ioaddr + EL3_STATUS);
|
||||
if (status & 0x0001 /* IRQ line active, missed one. */
|
||||
&& inw(ioaddr + EL3_STATUS) & 1) { /* Make sure. */
|
||||
if (status & 0x0001 && /* IRQ line active, missed one. */
|
||||
inw(ioaddr + EL3_STATUS) & 1) { /* Make sure. */
|
||||
pr_debug("%s: Missed interrupt, status then %04x now %04x"
|
||||
" Tx %2.2x Rx %4.4x.\n", dev->name, status,
|
||||
inw(ioaddr + EL3_STATUS), inb(ioaddr + TX_STATUS),
|
||||
|
Reference in New Issue
Block a user