From: Hui Tang <tanghui20@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Hui Tang <tanghui20@huawei.com>,
Steffen Klassert <klassert@kernel.org>,
Jes Sorensen <jes@trained-monkey.org>,
Michael Chan <michael.chan@broadcom.com>,
"Rasesh Mody" <rmody@marvell.com>, <GR-Linux-NIC-Dev@marvell.com>,
Raju Rangoju <rajur@chelsio.com>,
Denis Kirjanov <kda@linux-powerpc.org>,
Mirko Lindner <mlindner@marvell.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Russell King <linux@armlinux.org.uk>,
Daniele Venzano <venza@brownhat.org>,
Nicolas Pitre <nico@fluxnic.net>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Shannon Nelson <snelson@pensando.io>,
Lee Jones <lee.jones@linaro.org>, "Joe Perches" <joe@perches.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Yixing Liu <liuyixing1@huawei.com>,
"Weihang Li" <liweihang@huawei.com>,
Vaibhav Gupta <vaibhavgupta40@gmail.com>,
"Masahiro Yamada" <masahiroy@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Miguel Ojeda <ojeda@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Thomas Gleixner <tglx@linutronix.de>, Jeremy Kerr <jk@ozlabs.org>,
Moritz Fischer <mdf@kernel.org>,
Wei Yongjun <weiyongjun1@huawei.com>,
Edward Cree <ecree@solarflare.com>,
"Jesse Brandeburg" <jesse.brandeburg@intel.com>,
Zheng Yongjun <zhengyongjun3@huawei.com>,
Jason Yan <yanaijie@huawei.com>, Andrew Lunn <andrew@lunn.ch>,
Colin Ian King <colin.king@canonical.com>,
Romain Perier <romain.perier@gmail.com>,
Allen Pais <apais@linux.microsoft.com>,
Wang Hai <wanghai38@huawei.com>,
Luo Jiaxing <luojiaxing@huawei.com>, Chao Yu <chao@kernel.org>,
Kees Cook <keescook@chromium.org>,
YueHaibing <yuehaibing@huawei.com>,
Bhaskar Chowdhury <unixbhaskar@gmail.com>,
"Gaurav Singh" <gaurav1086@gmail.com>, <linux-acenic@sunsite.dk>,
<linux-parisc@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH 04/20] net: apple: remove leading spaces before tabs
Date: Wed, 19 May 2021 12:45:29 +0800 [thread overview]
Message-ID: <1621399671-15517-5-git-send-email-tanghui20@huawei.com> (raw)
In-Reply-To: <1621399671-15517-1-git-send-email-tanghui20@huawei.com>
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@huawei.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
next prev parent reply other threads:[~2021-05-19 4:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-19 4:45 [PATCH 00/20] net: ethernet: remove leading spaces before tabs Hui Tang
2021-05-19 4:45 ` [PATCH 01/20] net: 3com: " Hui Tang
2021-05-19 4:45 ` [PATCH 02/20] net: alteon: " Hui Tang
2021-05-19 4:45 ` [PATCH 03/20] net: amd: " Hui Tang
2021-05-19 4:45 ` Hui Tang [this message]
2021-05-19 4:45 ` [PATCH 05/20] net: broadcom: " Hui Tang
2021-05-19 5:04 ` [PATCH 00/20] net: ethernet: " Hui Tang
2021-05-19 5:30 Hui Tang
2021-05-19 5:30 ` [PATCH 04/20] net: apple: " Hui Tang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1621399671-15517-5-git-send-email-tanghui20@huawei.com \
--to=tanghui20@huawei.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=akpm@linux-foundation.org \
--cc=andrew@lunn.ch \
--cc=apais@linux.microsoft.com \
--cc=bigeasy@linutronix.de \
--cc=chao@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=gaurav1086@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gustavoars@kernel.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jes@trained-monkey.org \
--cc=jesse.brandeburg@intel.com \
--cc=jk@ozlabs.org \
--cc=joe@perches.com \
--cc=kda@linux-powerpc.org \
--cc=keescook@chromium.org \
--cc=klassert@kernel.org \
--cc=kuba@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-acenic@sunsite.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=liuyixing1@huawei.com \
--cc=liweihang@huawei.com \
--cc=luojiaxing@huawei.com \
--cc=masahiroy@kernel.org \
--cc=mdf@kernel.org \
--cc=michael.chan@broadcom.com \
--cc=mlindner@marvell.com \
--cc=nathan@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=ojeda@kernel.org \
--cc=rajur@chelsio.com \
--cc=rmody@marvell.com \
--cc=romain.perier@gmail.com \
--cc=rppt@kernel.org \
--cc=snelson@pensando.io \
--cc=stephen@networkplumber.org \
--cc=tglx@linutronix.de \
--cc=unixbhaskar@gmail.com \
--cc=vaibhavgupta40@gmail.com \
--cc=venza@brownhat.org \
--cc=wanghai38@huawei.com \
--cc=weiyongjun1@huawei.com \
--cc=yanaijie@huawei.com \
--cc=yuehaibing@huawei.com \
--cc=zhengyongjun3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).