[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1621399671-15517-5-git-send-email-tanghui20@huawei.com>
Date: Wed, 19 May 2021 12:45:29 +0800
From: Hui Tang <tanghui20@...wei.com>
To: <davem@...emloft.net>, <kuba@...nel.org>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Hui Tang <tanghui20@...wei.com>,
Steffen Klassert <klassert@...nel.org>,
Jes Sorensen <jes@...ined-monkey.org>,
Michael Chan <michael.chan@...adcom.com>,
"Rasesh Mody" <rmody@...vell.com>, <GR-Linux-NIC-Dev@...vell.com>,
Raju Rangoju <rajur@...lsio.com>,
Denis Kirjanov <kda@...ux-powerpc.org>,
Mirko Lindner <mlindner@...vell.com>,
Stephen Hemminger <stephen@...workplumber.org>,
Russell King <linux@...linux.org.uk>,
Daniele Venzano <venza@...wnhat.org>,
Nicolas Pitre <nico@...xnic.net>,
Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
Shannon Nelson <snelson@...sando.io>,
Lee Jones <lee.jones@...aro.org>,
"Joe Perches" <joe@...ches.com>,
"Gustavo A. R. Silva" <gustavoars@...nel.org>,
Nathan Chancellor <nathan@...nel.org>,
Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Yixing Liu <liuyixing1@...wei.com>,
"Weihang Li" <liweihang@...wei.com>,
Vaibhav Gupta <vaibhavgupta40@...il.com>,
"Masahiro Yamada" <masahiroy@...nel.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Miguel Ojeda <ojeda@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Mike Rapoport <rppt@...nel.org>,
Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Thomas Gleixner <tglx@...utronix.de>,
Jeremy Kerr <jk@...abs.org>, Moritz Fischer <mdf@...nel.org>,
Wei Yongjun <weiyongjun1@...wei.com>,
Edward Cree <ecree@...arflare.com>,
"Jesse Brandeburg" <jesse.brandeburg@...el.com>,
Zheng Yongjun <zhengyongjun3@...wei.com>,
Jason Yan <yanaijie@...wei.com>, Andrew Lunn <andrew@...n.ch>,
Colin Ian King <colin.king@...onical.com>,
Romain Perier <romain.perier@...il.com>,
Allen Pais <apais@...ux.microsoft.com>,
Wang Hai <wanghai38@...wei.com>,
Luo Jiaxing <luojiaxing@...wei.com>, Chao Yu <chao@...nel.org>,
Kees Cook <keescook@...omium.org>,
YueHaibing <yuehaibing@...wei.com>,
Bhaskar Chowdhury <unixbhaskar@...il.com>,
"Gaurav Singh" <gaurav1086@...il.com>, <linux-acenic@...site.dk>,
<linux-parisc@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>
Subject: [PATCH 04/20] 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: Hui Tang <tanghui20@...wei.com>
---
drivers/net/ethernet/apple/bmac.c | 30 +++++++++++++++---------------
drivers/net/ethernet/apple/mace.c | 8 ++++----
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index 1e4e402..a989d2d 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -477,26 +477,26 @@ static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)
config = bmread(dev, RXCFG);
bmwrite(dev, RXCFG, (config & ~RxMACEnable));
config = bmread(dev, TXCFG);
- bmwrite(dev, TXCFG, (config & ~TxMACEnable));
+ bmwrite(dev, TXCFG, (config & ~TxMACEnable));
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 */
td->control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE)); /* clear run bit */
- /* free some skb's */
- for (i=0; i<N_RX_RING; i++) {
- if (bp->rx_bufs[i] != NULL) {
- dev_kfree_skb(bp->rx_bufs[i]);
- bp->rx_bufs[i] = NULL;
- }
- }
- for (i = 0; i<N_TX_RING; i++) {
+ /* free some skb's */
+ for (i=0; i<N_RX_RING; i++) {
+ if (bp->rx_bufs[i] != NULL) {
+ dev_kfree_skb(bp->rx_bufs[i]);
+ bp->rx_bufs[i] = NULL;
+ }
+ }
+ for (i = 0; i<N_TX_RING; i++) {
if (bp->tx_bufs[i] != NULL) {
dev_kfree_skb(bp->tx_bufs[i]);
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;
}
@@ -510,9 +510,9 @@ static int bmac_resume(struct macio_dev *mdev)
bmac_reset_and_enable(dev);
enable_irq(dev->irq);
- enable_irq(bp->tx_dma_intr);
- enable_irq(bp->rx_dma_intr);
- netif_device_attach(dev);
+ enable_irq(bp->tx_dma_intr);
+ enable_irq(bp->rx_dma_intr);
+ netif_device_attach(dev);
return 0;
}
@@ -1599,7 +1599,7 @@ static int bmac_remove(struct macio_dev *mdev)
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(dev->irq, dev);
free_irq(bp->tx_dma_intr, dev);
free_irq(bp->rx_dma_intr, dev);
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index 9e5006e..4b80e3a 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -364,9 +364,9 @@ static void mace_reset(struct net_device *dev)
out_8(&mb->iac, 0);
if (mp->port_aaui)
- out_8(&mb->plscc, PORTSEL_AUI + ENPLSIO);
+ out_8(&mb->plscc, PORTSEL_AUI + ENPLSIO);
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)
@@ -378,9 +378,9 @@ static void __mace_set_address(struct net_device *dev, void *addr)
/* load up the hardware address */
if (mp->chipid == BROKEN_ADDRCHG_REV)
- out_8(&mb->iac, PHYADDR);
+ out_8(&mb->iac, PHYADDR);
else {
- out_8(&mb->iac, ADDRCHG | PHYADDR);
+ out_8(&mb->iac, ADDRCHG | PHYADDR);
while ((in_8(&mb->iac) & ADDRCHG) != 0)
;
}
--
2.8.1
Powered by blists - more mailing lists