mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
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:
parent
3454f83583
commit
8e95a2026f
132 changed files with 799 additions and 805 deletions
|
@ -712,8 +712,8 @@ static int streamer_open(struct net_device *dev)
|
|||
strcat(open_error, " - ");
|
||||
strcat(open_error, open_min_error[(error_code & 0x0f)]);
|
||||
|
||||
if (!streamer_priv->streamer_ring_speed
|
||||
&& ((error_code & 0x0f) == 0x0d))
|
||||
if (!streamer_priv->streamer_ring_speed &&
|
||||
((error_code & 0x0f) == 0x0d))
|
||||
{
|
||||
printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name);
|
||||
printk(KERN_WARNING "%s: Please try again with a specified ring speed \n", dev->name);
|
||||
|
@ -1032,8 +1032,8 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id)
|
|||
sisr = readw(streamer_mmio + SISR);
|
||||
|
||||
while((sisr & (SISR_MI | SISR_SRB_REPLY | SISR_ADAPTER_CHECK | SISR_ASB_FREE |
|
||||
SISR_ARB_CMD | SISR_TRB_REPLY | SISR_PAR_ERR | SISR_SERR_ERR))
|
||||
&& (max_intr > 0)) {
|
||||
SISR_ARB_CMD | SISR_TRB_REPLY | SISR_PAR_ERR | SISR_SERR_ERR)) &&
|
||||
(max_intr > 0)) {
|
||||
|
||||
if(sisr & SISR_PAR_ERR) {
|
||||
writew(~SISR_PAR_ERR, streamer_mmio + SISR_RUM);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue