net: smsc: remove leading spaces before tabs
There are a few leading spaces before tabs and remove it by running the following commard: $ find . -name '*.c' | xargs sed -r -i 's/^[ ]+\t/\t/' $ find . -name '*.h' | xargs sed -r -i 's/^[ ]+\t/\t/' Cc: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Hui Tang <tanghui20@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
a294ddfccb
commit
996d7ab8ba
@@ -182,8 +182,8 @@ struct smc_local {
|
|||||||
struct sk_buff * saved_skb;
|
struct sk_buff * saved_skb;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
. This keeps track of how many packets that I have
|
. This keeps track of how many packets that I have
|
||||||
. sent out. When an TX_EMPTY interrupt comes, I know
|
. sent out. When an TX_EMPTY interrupt comes, I know
|
||||||
. that all of these have been sent.
|
. that all of these have been sent.
|
||||||
*/
|
*/
|
||||||
int packets_waiting;
|
int packets_waiting;
|
||||||
@@ -343,7 +343,7 @@ static void smc_reset( int ioaddr )
|
|||||||
|
|
||||||
/* Note: It doesn't seem that waiting for the MMU busy is needed here,
|
/* Note: It doesn't seem that waiting for the MMU busy is needed here,
|
||||||
but this is a place where future chipsets _COULD_ break. Be wary
|
but this is a place where future chipsets _COULD_ break. Be wary
|
||||||
of issuing another MMU command right after this */
|
of issuing another MMU command right after this */
|
||||||
|
|
||||||
outb( 0, ioaddr + INT_MASK );
|
outb( 0, ioaddr + INT_MASK );
|
||||||
}
|
}
|
||||||
@@ -521,9 +521,9 @@ static netdev_tx_t smc_wait_to_send_packet(struct sk_buff *skb,
|
|||||||
SMC_SELECT_BANK( 2 );
|
SMC_SELECT_BANK( 2 );
|
||||||
outw( MC_ALLOC | numPages, ioaddr + MMU_CMD );
|
outw( MC_ALLOC | numPages, ioaddr + MMU_CMD );
|
||||||
/*
|
/*
|
||||||
. Performance Hack
|
. Performance Hack
|
||||||
.
|
.
|
||||||
. wait a short amount of time.. if I can send a packet now, I send
|
. wait a short amount of time.. if I can send a packet now, I send
|
||||||
. it now. Otherwise, I enable an interrupt and wait for one to be
|
. it now. Otherwise, I enable an interrupt and wait for one to be
|
||||||
. available.
|
. available.
|
||||||
.
|
.
|
||||||
@@ -540,17 +540,17 @@ static netdev_tx_t smc_wait_to_send_packet(struct sk_buff *skb,
|
|||||||
if ( status & IM_ALLOC_INT ) {
|
if ( status & IM_ALLOC_INT ) {
|
||||||
/* acknowledge the interrupt */
|
/* acknowledge the interrupt */
|
||||||
outb( IM_ALLOC_INT, ioaddr + INTERRUPT );
|
outb( IM_ALLOC_INT, ioaddr + INTERRUPT );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while ( -- time_out );
|
} while ( -- time_out );
|
||||||
|
|
||||||
if ( !time_out ) {
|
if ( !time_out ) {
|
||||||
/* oh well, wait until the chip finds memory later */
|
/* oh well, wait until the chip finds memory later */
|
||||||
SMC_ENABLE_INT( IM_ALLOC_INT );
|
SMC_ENABLE_INT( IM_ALLOC_INT );
|
||||||
PRINTK2((CARDNAME": memory allocation deferred.\n"));
|
PRINTK2((CARDNAME": memory allocation deferred.\n"));
|
||||||
/* it's deferred, but I'll handle it later */
|
/* it's deferred, but I'll handle it later */
|
||||||
return NETDEV_TX_OK;
|
return NETDEV_TX_OK;
|
||||||
}
|
}
|
||||||
/* or YES! I can send the packet now.. */
|
/* or YES! I can send the packet now.. */
|
||||||
smc_hardware_send_packet(dev);
|
smc_hardware_send_packet(dev);
|
||||||
netif_wake_queue(dev);
|
netif_wake_queue(dev);
|
||||||
@@ -616,7 +616,7 @@ static void smc_hardware_send_packet( struct net_device * dev )
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* send the packet length ( +6 for status, length and ctl byte )
|
/* send the packet length ( +6 for status, length and ctl byte )
|
||||||
and the status word ( set to zeros ) */
|
and the status word ( set to zeros ) */
|
||||||
#ifdef USE_32_BIT
|
#ifdef USE_32_BIT
|
||||||
outl( (length +6 ) << 16 , ioaddr + DATA_1 );
|
outl( (length +6 ) << 16 , ioaddr + DATA_1 );
|
||||||
#else
|
#else
|
||||||
@@ -629,8 +629,8 @@ static void smc_hardware_send_packet( struct net_device * dev )
|
|||||||
/* send the actual data
|
/* send the actual data
|
||||||
. I _think_ it's faster to send the longs first, and then
|
. I _think_ it's faster to send the longs first, and then
|
||||||
. mop up by sending the last word. It depends heavily
|
. mop up by sending the last word. It depends heavily
|
||||||
. on alignment, at least on the 486. Maybe it would be
|
. on alignment, at least on the 486. Maybe it would be
|
||||||
. a good idea to check which is optimal? But that could take
|
. a good idea to check which is optimal? But that could take
|
||||||
. almost as much time as is saved?
|
. almost as much time as is saved?
|
||||||
*/
|
*/
|
||||||
#ifdef USE_32_BIT
|
#ifdef USE_32_BIT
|
||||||
@@ -757,7 +757,7 @@ static int __init smc_findirq(int ioaddr)
|
|||||||
outb( IM_ALLOC_INT, ioaddr + INT_MASK );
|
outb( IM_ALLOC_INT, ioaddr + INT_MASK );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
. Allocate 512 bytes of memory. Note that the chip was just
|
. Allocate 512 bytes of memory. Note that the chip was just
|
||||||
. reset so all the memory is available
|
. reset so all the memory is available
|
||||||
*/
|
*/
|
||||||
outw( MC_ALLOC | 1, ioaddr + MMU_CMD );
|
outw( MC_ALLOC | 1, ioaddr + MMU_CMD );
|
||||||
@@ -871,7 +871,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
/* The above MIGHT indicate a device, but I need to write to further
|
/* The above MIGHT indicate a device, but I need to write to further
|
||||||
test this. */
|
test this. */
|
||||||
outw( 0x0, ioaddr + BANK_SELECT );
|
outw( 0x0, ioaddr + BANK_SELECT );
|
||||||
bank = inw( ioaddr + BANK_SELECT );
|
bank = inw( ioaddr + BANK_SELECT );
|
||||||
if ( (bank & 0xFF00 ) != 0x3300 ) {
|
if ( (bank & 0xFF00 ) != 0x3300 ) {
|
||||||
@@ -879,7 +879,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
/* well, we've already written once, so hopefully another time won't
|
/* well, we've already written once, so hopefully another time won't
|
||||||
hurt. This time, I need to switch the bank register to bank 1,
|
hurt. This time, I need to switch the bank register to bank 1,
|
||||||
so I can access the base address register */
|
so I can access the base address register */
|
||||||
SMC_SELECT_BANK(1);
|
SMC_SELECT_BANK(1);
|
||||||
base_address_register = inw( ioaddr + BASE );
|
base_address_register = inw( ioaddr + BASE );
|
||||||
@@ -917,7 +917,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
dev->base_addr = ioaddr;
|
dev->base_addr = ioaddr;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
. Get the MAC address ( bank 1, regs 4 - 9 )
|
. Get the MAC address ( bank 1, regs 4 - 9 )
|
||||||
*/
|
*/
|
||||||
SMC_SELECT_BANK( 1 );
|
SMC_SELECT_BANK( 1 );
|
||||||
for ( i = 0; i < 6; i += 2 ) {
|
for ( i = 0; i < 6; i += 2 ) {
|
||||||
@@ -938,8 +938,8 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
Now, I want to find out more about the chip. This is sort of
|
Now, I want to find out more about the chip. This is sort of
|
||||||
redundant, but it's cleaner to have it in both, rather than having
|
redundant, but it's cleaner to have it in both, rather than having
|
||||||
one VERY long probe procedure.
|
one VERY long probe procedure.
|
||||||
*/
|
*/
|
||||||
SMC_SELECT_BANK(3);
|
SMC_SELECT_BANK(3);
|
||||||
revision_register = inw( ioaddr + REVISION );
|
revision_register = inw( ioaddr + REVISION );
|
||||||
@@ -967,7 +967,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
/*
|
/*
|
||||||
. If dev->irq is 0, then the device has to be banged on to see
|
. If dev->irq is 0, then the device has to be banged on to see
|
||||||
. what the IRQ is.
|
. what the IRQ is.
|
||||||
.
|
.
|
||||||
. This banging doesn't always detect the IRQ, for unknown reasons.
|
. This banging doesn't always detect the IRQ, for unknown reasons.
|
||||||
. a workaround is to reset the chip and try again.
|
. a workaround is to reset the chip and try again.
|
||||||
.
|
.
|
||||||
@@ -978,7 +978,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
|
|||||||
.
|
.
|
||||||
. Specifying an IRQ is done with the assumption that the user knows
|
. Specifying an IRQ is done with the assumption that the user knows
|
||||||
. what (s)he is doing. No checking is done!!!!
|
. what (s)he is doing. No checking is done!!!!
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
if ( dev->irq < 2 ) {
|
if ( dev->irq < 2 ) {
|
||||||
int trials;
|
int trials;
|
||||||
@@ -1070,7 +1070,7 @@ static int smc_open(struct net_device *dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
According to Becker, I have to set the hardware address
|
According to Becker, I have to set the hardware address
|
||||||
at this point, because the (l)user can set it with an
|
at this point, because the (l)user can set it with an
|
||||||
ioctl. Easily done...
|
ioctl. Easily done...
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -671,19 +671,19 @@ smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||||||
status = SMC_GET_INT(lp);
|
status = SMC_GET_INT(lp);
|
||||||
if (status & IM_ALLOC_INT) {
|
if (status & IM_ALLOC_INT) {
|
||||||
SMC_ACK_INT(lp, IM_ALLOC_INT);
|
SMC_ACK_INT(lp, IM_ALLOC_INT);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (--poll_count);
|
} while (--poll_count);
|
||||||
|
|
||||||
smc_special_unlock(&lp->lock, flags);
|
smc_special_unlock(&lp->lock, flags);
|
||||||
|
|
||||||
lp->pending_tx_skb = skb;
|
lp->pending_tx_skb = skb;
|
||||||
if (!poll_count) {
|
if (!poll_count) {
|
||||||
/* oh well, wait until the chip finds memory later */
|
/* oh well, wait until the chip finds memory later */
|
||||||
netif_stop_queue(dev);
|
netif_stop_queue(dev);
|
||||||
DBG(2, dev, "TX memory allocation deferred.\n");
|
DBG(2, dev, "TX memory allocation deferred.\n");
|
||||||
SMC_ENABLE_INT(lp, IM_ALLOC_INT);
|
SMC_ENABLE_INT(lp, IM_ALLOC_INT);
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
* Allocation succeeded: push packet to the chip's own memory
|
* Allocation succeeded: push packet to the chip's own memory
|
||||||
* immediately.
|
* immediately.
|
||||||
@@ -1790,7 +1790,7 @@ static int smc_findirq(struct smc_local *lp)
|
|||||||
SMC_SET_INT_MASK(lp, IM_ALLOC_INT);
|
SMC_SET_INT_MASK(lp, IM_ALLOC_INT);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate 512 bytes of memory. Note that the chip was just
|
* Allocate 512 bytes of memory. Note that the chip was just
|
||||||
* reset so all the memory is available
|
* reset so all the memory is available
|
||||||
*/
|
*/
|
||||||
SMC_SET_MMU_CMD(lp, MC_ALLOC | 1);
|
SMC_SET_MMU_CMD(lp, MC_ALLOC | 1);
|
||||||
@@ -1998,8 +1998,8 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
|
|||||||
|
|
||||||
/* Grab the IRQ */
|
/* Grab the IRQ */
|
||||||
retval = request_irq(dev->irq, smc_interrupt, irq_flags, dev->name, dev);
|
retval = request_irq(dev->irq, smc_interrupt, irq_flags, dev->name, dev);
|
||||||
if (retval)
|
if (retval)
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_PXA
|
#ifdef CONFIG_ARCH_PXA
|
||||||
# ifdef SMC_USE_PXA_DMA
|
# ifdef SMC_USE_PXA_DMA
|
||||||
|
|||||||
Reference in New Issue
Block a user