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: remove trailing whitespaces
This patch removes trailing whitespaces. 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
57b6de35cf
commit
a04544ffe8
1 changed files with 105 additions and 119 deletions
|
@ -500,7 +500,6 @@ static void z8530_dma_rx(struct z8530_channel *chan)
|
||||||
* We have received an interrupt while doing DMA transmissions. It
|
* We have received an interrupt while doing DMA transmissions. It
|
||||||
* shouldn't happen. Scream loudly if it does.
|
* shouldn't happen. Scream loudly if it does.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void z8530_dma_tx(struct z8530_channel *chan)
|
static void z8530_dma_tx(struct z8530_channel *chan)
|
||||||
{
|
{
|
||||||
if(!chan->dma_tx)
|
if(!chan->dma_tx)
|
||||||
|
@ -523,7 +522,6 @@ static void z8530_dma_tx(struct z8530_channel *chan)
|
||||||
* and kick the next packet out. Secondly we may see a DCD change.
|
* and kick the next packet out. Secondly we may see a DCD change.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void z8530_dma_status(struct z8530_channel *chan)
|
static void z8530_dma_status(struct z8530_channel *chan)
|
||||||
{
|
{
|
||||||
u8 status, altered;
|
u8 status, altered;
|
||||||
|
@ -744,7 +742,6 @@ static const u8 reg_init[16]=
|
||||||
* Switch a Z8530 into synchronous mode without DMA assist. We
|
* Switch a Z8530 into synchronous mode without DMA assist. We
|
||||||
* raise the RTS/DTR and commence network operation.
|
* raise the RTS/DTR and commence network operation.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int z8530_sync_open(struct net_device *dev, struct z8530_channel *c)
|
int z8530_sync_open(struct net_device *dev, struct z8530_channel *c)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -780,7 +777,6 @@ EXPORT_SYMBOL(z8530_sync_open);
|
||||||
* Close down a Z8530 interface and switch its interrupt handlers
|
* Close down a Z8530 interface and switch its interrupt handlers
|
||||||
* to discard future events.
|
* to discard future events.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int z8530_sync_close(struct net_device *dev, struct z8530_channel *c)
|
int z8530_sync_close(struct net_device *dev, struct z8530_channel *c)
|
||||||
{
|
{
|
||||||
u8 chk;
|
u8 chk;
|
||||||
|
@ -809,7 +805,6 @@ EXPORT_SYMBOL(z8530_sync_close);
|
||||||
* ISA DMA channels must be available for this to work. We assume ISA
|
* ISA DMA channels must be available for this to work. We assume ISA
|
||||||
* DMA driven I/O and PC limits on access.
|
* DMA driven I/O and PC limits on access.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int z8530_sync_dma_open(struct net_device *dev, struct z8530_channel *c)
|
int z8530_sync_dma_open(struct net_device *dev, struct z8530_channel *c)
|
||||||
{
|
{
|
||||||
unsigned long cflags, dflags;
|
unsigned long cflags, dflags;
|
||||||
|
@ -924,7 +919,6 @@ EXPORT_SYMBOL(z8530_sync_dma_open);
|
||||||
* Shut down a DMA mode synchronous interface. Halt the DMA, and
|
* Shut down a DMA mode synchronous interface. Halt the DMA, and
|
||||||
* free the buffers.
|
* free the buffers.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int z8530_sync_dma_close(struct net_device *dev, struct z8530_channel *c)
|
int z8530_sync_dma_close(struct net_device *dev, struct z8530_channel *c)
|
||||||
{
|
{
|
||||||
u8 chk;
|
u8 chk;
|
||||||
|
@ -937,7 +931,7 @@ int z8530_sync_dma_close(struct net_device *dev, struct z8530_channel *c)
|
||||||
/* Disable the PC DMA channels
|
/* Disable the PC DMA channels
|
||||||
*/
|
*/
|
||||||
|
|
||||||
flags=claim_dma_lock();
|
flags = claim_dma_lock();
|
||||||
disable_dma(c->rxdma);
|
disable_dma(c->rxdma);
|
||||||
clear_dma_ff(c->rxdma);
|
clear_dma_ff(c->rxdma);
|
||||||
|
|
||||||
|
@ -1136,7 +1130,6 @@ EXPORT_SYMBOL(z8530_sync_txdma_close);
|
||||||
/* Name strings for Z8530 chips. SGI claim to have a 130, Zilog deny
|
/* Name strings for Z8530 chips. SGI claim to have a 130, Zilog deny
|
||||||
* it exists...
|
* it exists...
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const char *z8530_type_name[]={
|
static const char *z8530_type_name[]={
|
||||||
"Z8530",
|
"Z8530",
|
||||||
"Z85C30",
|
"Z85C30",
|
||||||
|
@ -1167,7 +1160,6 @@ EXPORT_SYMBOL(z8530_describe);
|
||||||
|
|
||||||
/* Locked operation part of the z8530 init code
|
/* Locked operation part of the z8530 init code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static inline int do_z8530_init(struct z8530_dev *dev)
|
static inline int do_z8530_init(struct z8530_dev *dev)
|
||||||
{
|
{
|
||||||
/* NOP the interrupt handlers first - we might get a
|
/* NOP the interrupt handlers first - we might get a
|
||||||
|
@ -1272,7 +1264,6 @@ EXPORT_SYMBOL(z8530_init);
|
||||||
*
|
*
|
||||||
* This is called without the lock held
|
* This is called without the lock held
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int z8530_shutdown(struct z8530_dev *dev)
|
int z8530_shutdown(struct z8530_dev *dev)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -1392,7 +1383,6 @@ static void z8530_tx_begin(struct z8530_channel *c)
|
||||||
/* These two are needed by the 8530/85C30
|
/* These two are needed by the 8530/85C30
|
||||||
* and must be issued when idling.
|
* and must be issued when idling.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(c->dev->type!=Z85230)
|
if(c->dev->type!=Z85230)
|
||||||
{
|
{
|
||||||
write_zsctrl(c, RES_Tx_CRC);
|
write_zsctrl(c, RES_Tx_CRC);
|
||||||
|
@ -1411,8 +1401,7 @@ static void z8530_tx_begin(struct z8530_channel *c)
|
||||||
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);
|
||||||
|
|
||||||
while(c->txcount && (read_zsreg(c,R0)&Tx_BUF_EMP))
|
while (c->txcount && (read_zsreg(c, R0) & Tx_BUF_EMP)) {
|
||||||
{
|
|
||||||
write_zsreg(c, R8, *c->tx_ptr++);
|
write_zsreg(c, R8, *c->tx_ptr++);
|
||||||
c->txcount--;
|
c->txcount--;
|
||||||
}
|
}
|
||||||
|
@ -1458,7 +1447,6 @@ static void z8530_tx_done(struct z8530_channel *c)
|
||||||
* We point the receive handler at this function when idle. Instead
|
* We point the receive handler at this function when idle. Instead
|
||||||
* of processing the frames we get to throw them away.
|
* of processing the frames we get to throw them away.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb)
|
void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
dev_kfree_skb_any(skb);
|
dev_kfree_skb_any(skb);
|
||||||
|
@ -1477,7 +1465,6 @@ EXPORT_SYMBOL(z8530_null_rx);
|
||||||
*
|
*
|
||||||
* Called with the lock held
|
* Called with the lock held
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void z8530_rx_done(struct z8530_channel *c)
|
static void z8530_rx_done(struct z8530_channel *c)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
|
@ -1628,7 +1615,6 @@ static inline int spans_boundary(struct sk_buff *skb)
|
||||||
* Called from the network code. The lock is not held at this
|
* Called from the network code. The lock is not held at this
|
||||||
* point.
|
* point.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
|
netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
Loading…
Reference in a new issue