Commit a22cf81d authored by Hui Tang's avatar Hui Tang Committed by David S. Miller

net: apple: 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/'
Signed-off-by: default avatarHui Tang <tanghui20@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 106b4cb5
...@@ -477,26 +477,26 @@ static int bmac_suspend(struct macio_dev *mdev, pm_message_t state) ...@@ -477,26 +477,26 @@ static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)
config = bmread(dev, RXCFG); config = bmread(dev, RXCFG);
bmwrite(dev, RXCFG, (config & ~RxMACEnable)); bmwrite(dev, RXCFG, (config & ~RxMACEnable));
config = bmread(dev, TXCFG); config = bmread(dev, TXCFG);
bmwrite(dev, TXCFG, (config & ~TxMACEnable)); bmwrite(dev, TXCFG, (config & ~TxMACEnable));
bmwrite(dev, INTDISABLE, DisableAll); /* disable all intrs */ bmwrite(dev, INTDISABLE, DisableAll); /* disable all intrs */
/* disable rx and tx dma */ /* disable rx and tx dma */
rd->control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE)); /* clear run bit */ rd->control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE)); /* clear run bit */
td->control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE)); /* clear run bit */ td->control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE)); /* clear run bit */
/* free some skb's */ /* free some skb's */
for (i=0; i<N_RX_RING; i++) { for (i=0; i<N_RX_RING; i++) {
if (bp->rx_bufs[i] != NULL) { if (bp->rx_bufs[i] != NULL) {
dev_kfree_skb(bp->rx_bufs[i]); dev_kfree_skb(bp->rx_bufs[i]);
bp->rx_bufs[i] = NULL; bp->rx_bufs[i] = NULL;
} }
} }
for (i = 0; i<N_TX_RING; i++) { for (i = 0; i<N_TX_RING; i++) {
if (bp->tx_bufs[i] != NULL) { if (bp->tx_bufs[i] != NULL) {
dev_kfree_skb(bp->tx_bufs[i]); dev_kfree_skb(bp->tx_bufs[i]);
bp->tx_bufs[i] = NULL; bp->tx_bufs[i] = NULL;
} }
} }
} }
pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp->mdev), 0, 0); pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp->mdev), 0, 0);
return 0; return 0;
} }
...@@ -510,9 +510,9 @@ static int bmac_resume(struct macio_dev *mdev) ...@@ -510,9 +510,9 @@ static int bmac_resume(struct macio_dev *mdev)
bmac_reset_and_enable(dev); bmac_reset_and_enable(dev);
enable_irq(dev->irq); enable_irq(dev->irq);
enable_irq(bp->tx_dma_intr); enable_irq(bp->tx_dma_intr);
enable_irq(bp->rx_dma_intr); enable_irq(bp->rx_dma_intr);
netif_device_attach(dev); netif_device_attach(dev);
return 0; return 0;
} }
...@@ -1599,7 +1599,7 @@ static int bmac_remove(struct macio_dev *mdev) ...@@ -1599,7 +1599,7 @@ static int bmac_remove(struct macio_dev *mdev)
unregister_netdev(dev); unregister_netdev(dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
free_irq(bp->tx_dma_intr, dev); free_irq(bp->tx_dma_intr, dev);
free_irq(bp->rx_dma_intr, dev); free_irq(bp->rx_dma_intr, dev);
......
...@@ -364,9 +364,9 @@ static void mace_reset(struct net_device *dev) ...@@ -364,9 +364,9 @@ static void mace_reset(struct net_device *dev)
out_8(&mb->iac, 0); out_8(&mb->iac, 0);
if (mp->port_aaui) if (mp->port_aaui)
out_8(&mb->plscc, PORTSEL_AUI + ENPLSIO); out_8(&mb->plscc, PORTSEL_AUI + ENPLSIO);
else else
out_8(&mb->plscc, PORTSEL_GPSI + ENPLSIO); out_8(&mb->plscc, PORTSEL_GPSI + ENPLSIO);
} }
static void __mace_set_address(struct net_device *dev, void *addr) static void __mace_set_address(struct net_device *dev, void *addr)
...@@ -378,9 +378,9 @@ static void __mace_set_address(struct net_device *dev, void *addr) ...@@ -378,9 +378,9 @@ static void __mace_set_address(struct net_device *dev, void *addr)
/* load up the hardware address */ /* load up the hardware address */
if (mp->chipid == BROKEN_ADDRCHG_REV) if (mp->chipid == BROKEN_ADDRCHG_REV)
out_8(&mb->iac, PHYADDR); out_8(&mb->iac, PHYADDR);
else { else {
out_8(&mb->iac, ADDRCHG | PHYADDR); out_8(&mb->iac, ADDRCHG | PHYADDR);
while ((in_8(&mb->iac) & ADDRCHG) != 0) while ((in_8(&mb->iac) & ADDRCHG) != 0)
; ;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment