mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
net: z85230: fix the code style issue about "if..else.."
According to the chackpatch.pl, else should follow close brace '}', braces {} should be used on all arms of this statement. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c6c3ba4578
commit
57b6de35cf
1 changed files with 8 additions and 16 deletions
|
@ -354,9 +354,7 @@ static void z8530_rx(struct z8530_channel *c)
|
||||||
/* printk("crc error\n"); */
|
/* printk("crc error\n"); */
|
||||||
}
|
}
|
||||||
/* Shove the frame upstream */
|
/* Shove the frame upstream */
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
/* Drop the lock for RX processing, or
|
/* Drop the lock for RX processing, or
|
||||||
* there are deadlocks
|
* there are deadlocks
|
||||||
*/
|
*/
|
||||||
|
@ -489,9 +487,7 @@ static void z8530_dma_rx(struct z8530_channel *chan)
|
||||||
}
|
}
|
||||||
write_zsctrl(chan, ERR_RES);
|
write_zsctrl(chan, ERR_RES);
|
||||||
write_zsctrl(chan, RES_H_IUS);
|
write_zsctrl(chan, RES_H_IUS);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
/* DMA is off right now, drain the slow way */
|
/* DMA is off right now, drain the slow way */
|
||||||
z8530_rx(chan);
|
z8530_rx(chan);
|
||||||
}
|
}
|
||||||
|
@ -1379,9 +1375,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
|
||||||
release_dma_lock(flags);
|
release_dma_lock(flags);
|
||||||
}
|
}
|
||||||
c->txcount=0;
|
c->txcount=0;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
c->txcount=c->tx_skb->len;
|
c->txcount=c->tx_skb->len;
|
||||||
|
|
||||||
if(c->dma_tx)
|
if(c->dma_tx)
|
||||||
|
@ -1412,9 +1406,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
|
||||||
release_dma_lock(flags);
|
release_dma_lock(flags);
|
||||||
write_zsctrl(c, RES_EOM_L);
|
write_zsctrl(c, RES_EOM_L);
|
||||||
write_zsreg(c, R5, c->regs[R5]|TxENAB);
|
write_zsreg(c, R5, c->regs[R5]|TxENAB);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
/* ABUNDER off */
|
/* ABUNDER off */
|
||||||
write_zsreg(c, R10, c->regs[10]);
|
write_zsreg(c, R10, c->regs[10]);
|
||||||
write_zsctrl(c, RES_Tx_CRC);
|
write_zsctrl(c, RES_Tx_CRC);
|
||||||
|
@ -1530,12 +1522,12 @@ static void z8530_rx_done(struct z8530_channel *c)
|
||||||
* from passing
|
* from passing
|
||||||
*/
|
*/
|
||||||
write_zsreg(c, R0, RES_Rx_CRC);
|
write_zsreg(c, R0, RES_Rx_CRC);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
/* Can't occur as we dont reenable the DMA irq until
|
/* Can't occur as we dont reenable the DMA irq until
|
||||||
* after the flip is done
|
* after the flip is done
|
||||||
*/
|
*/
|
||||||
netdev_warn(c->netdevice, "DMA flip overrun!\n");
|
netdev_warn(c->netdevice, "DMA flip overrun!\n");
|
||||||
|
}
|
||||||
|
|
||||||
release_dma_lock(flags);
|
release_dma_lock(flags);
|
||||||
|
|
||||||
|
@ -1661,9 +1653,9 @@ netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
|
||||||
c->tx_next_ptr=c->tx_dma_buf[c->tx_dma_used];
|
c->tx_next_ptr=c->tx_dma_buf[c->tx_dma_used];
|
||||||
c->tx_dma_used^=1; /* Flip temp buffer */
|
c->tx_dma_used^=1; /* Flip temp buffer */
|
||||||
skb_copy_from_linear_data(skb, c->tx_next_ptr, skb->len);
|
skb_copy_from_linear_data(skb, c->tx_next_ptr, skb->len);
|
||||||
|
} else {
|
||||||
|
c->tx_next_ptr = skb->data;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
c->tx_next_ptr=skb->data;
|
|
||||||
RT_LOCK;
|
RT_LOCK;
|
||||||
c->tx_next_skb=skb;
|
c->tx_next_skb=skb;
|
||||||
RT_UNLOCK;
|
RT_UNLOCK;
|
||||||
|
|
Loading…
Reference in a new issue