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
@@ -410,8 +410,8 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
|
||||
* and try to get the completion quickly
|
||||
* (1ms will be enough for those commands) */
|
||||
for (sleep_total = 0;
|
||||
sleep_total < 1000
|
||||
&& response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
|
||||
sleep_total < 1000 &&
|
||||
response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
|
||||
sleep_total += 10) {
|
||||
udelay(10);
|
||||
mb();
|
||||
@@ -419,8 +419,8 @@ myri10ge_send_cmd(struct myri10ge_priv *mgp, u32 cmd,
|
||||
} else {
|
||||
/* use msleep for most command */
|
||||
for (sleep_total = 0;
|
||||
sleep_total < 15
|
||||
&& response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
|
||||
sleep_total < 15 &&
|
||||
response->result == htonl(MYRI10GE_NO_RESPONSE_RESULT);
|
||||
sleep_total++)
|
||||
msleep(1);
|
||||
}
|
||||
@@ -557,8 +557,8 @@ myri10ge_validate_firmware(struct myri10ge_priv *mgp,
|
||||
sscanf(mgp->fw_version, "%d.%d.%d", &mgp->fw_ver_major,
|
||||
&mgp->fw_ver_minor, &mgp->fw_ver_tiny);
|
||||
|
||||
if (!(mgp->fw_ver_major == MXGEFW_VERSION_MAJOR
|
||||
&& mgp->fw_ver_minor == MXGEFW_VERSION_MINOR)) {
|
||||
if (!(mgp->fw_ver_major == MXGEFW_VERSION_MAJOR &&
|
||||
mgp->fw_ver_minor == MXGEFW_VERSION_MINOR)) {
|
||||
dev_err(dev, "Found firmware version %s\n", mgp->fw_version);
|
||||
dev_err(dev, "Driver needs %d.%d\n", MXGEFW_VERSION_MAJOR,
|
||||
MXGEFW_VERSION_MINOR);
|
||||
@@ -1412,8 +1412,8 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
|
||||
}
|
||||
|
||||
/* start the queue if we've stopped it */
|
||||
if (netif_tx_queue_stopped(dev_queue)
|
||||
&& tx->req - tx->done < (tx->mask >> 1)) {
|
||||
if (netif_tx_queue_stopped(dev_queue) &&
|
||||
tx->req - tx->done < (tx->mask >> 1)) {
|
||||
tx->wake_queue++;
|
||||
netif_tx_wake_queue(dev_queue);
|
||||
}
|
||||
|
Reference in New Issue
Block a user