From: Doug Berger <opendmb@gmail.com>
To: f.fainelli@gmail.com
Cc: robh+dt@kernel.org, mark.rutland@arm.com, davem@davemloft.net,
rafal@milecki.pl, xow@google.com, joel@jms.id.au,
jon.mason@broadcom.com, netdev@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
pgynther@google.com, jaedon.shin@gmail.com,
Doug Berger <opendmb@gmail.com>
Subject: [PATCH net-next 04/12] net: bcmgenet: remove meaningless lines
Date: Mon, 13 Mar 2017 17:41:34 -0700 [thread overview]
Message-ID: <20170314004142.4746-5-opendmb@gmail.com> (raw)
In-Reply-To: <20170314004142.4746-1-opendmb@gmail.com>
An assortment of non-functional lines are removed to reduce confusion
and some typos in comments are corrected.
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 2c008b09c4e3..22c92f5a9829 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -605,7 +605,7 @@ static int bcmgenet_set_coalesce(struct net_device *dev,
/* GENET TDMA hardware does not support a configurable timeout, but will
* always generate an interrupt either after MBDONE packets have been
- * transmitted, or when the ring is emtpy.
+ * transmitted, or when the ring is empty.
*/
if (ec->tx_coalesce_usecs || ec->tx_coalesce_usecs_high ||
ec->tx_coalesce_usecs_irq || ec->tx_coalesce_usecs_low)
@@ -1834,10 +1834,8 @@ static void bcmgenet_intr_disable(struct bcmgenet_priv *priv)
/* Mask all interrupts.*/
bcmgenet_intrl2_0_writel(priv, 0xFFFFFFFF, INTRL2_CPU_MASK_SET);
bcmgenet_intrl2_0_writel(priv, 0xFFFFFFFF, INTRL2_CPU_CLEAR);
- bcmgenet_intrl2_0_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);
bcmgenet_intrl2_1_writel(priv, 0xFFFFFFFF, INTRL2_CPU_MASK_SET);
bcmgenet_intrl2_1_writel(priv, 0xFFFFFFFF, INTRL2_CPU_CLEAR);
- bcmgenet_intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);
}
static void bcmgenet_link_intr_enable(struct bcmgenet_priv *priv)
@@ -1926,7 +1924,6 @@ static int init_umac(struct bcmgenet_priv *priv)
bcmgenet_intrl2_0_writel(priv, int0_enable, INTRL2_CPU_MASK_CLEAR);
bcmgenet_intrl2_1_writel(priv, int1_enable, INTRL2_CPU_MASK_CLEAR);
- /* Enable rx/tx engine.*/
dev_dbg(kdev, "done init umac\n");
return 0;
@@ -2836,7 +2833,7 @@ static int bcmgenet_close(struct net_device *dev)
if (ret)
return ret;
- /* Disable MAC transmit. TX DMA disabled have to done before this */
+ /* Disable MAC transmit. TX DMA disabled must be done before this */
umac_enable_set(priv, CMD_TX_EN, false);
/* tx reclaim */
@@ -3115,22 +3112,18 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)
bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;
genet_dma_ring_regs = genet_dma_ring_regs_v4;
priv->dma_rx_chk_bit = DMA_RX_CHK_V3PLUS;
- priv->version = GENET_V4;
} else if (GENET_IS_V3(priv)) {
bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;
genet_dma_ring_regs = genet_dma_ring_regs_v123;
priv->dma_rx_chk_bit = DMA_RX_CHK_V3PLUS;
- priv->version = GENET_V3;
} else if (GENET_IS_V2(priv)) {
bcmgenet_dma_regs = bcmgenet_dma_regs_v2;
genet_dma_ring_regs = genet_dma_ring_regs_v123;
priv->dma_rx_chk_bit = DMA_RX_CHK_V12;
- priv->version = GENET_V2;
} else if (GENET_IS_V1(priv)) {
bcmgenet_dma_regs = bcmgenet_dma_regs_v1;
genet_dma_ring_regs = genet_dma_ring_regs_v123;
priv->dma_rx_chk_bit = DMA_RX_CHK_V12;
- priv->version = GENET_V1;
}
/* enum genet_version starts at 1 */
@@ -3397,7 +3390,7 @@ static int bcmgenet_suspend(struct device *d)
if (ret)
return ret;
- /* Disable MAC transmit. TX DMA disabled have to done before this */
+ /* Disable MAC transmit. TX DMA disabled must be done before this */
umac_enable_set(priv, CMD_TX_EN, false);
/* tx reclaim */
--
2.11.1
next prev parent reply other threads:[~2017-03-14 0:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-14 0:41 [PATCH net-next 00/12] net: bcmgenet: add support for GENETv5 Doug Berger
2017-03-14 0:41 ` [PATCH net-next 01/12] net: phy: bcm-phylib: replace obsolete EEE macro references Doug Berger
[not found] ` <20170314004142.4746-2-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:49 ` Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 02/12] net: phy: bcm7xxx: add support for 28nm EPHY Doug Berger
[not found] ` <20170314004142.4746-3-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:50 ` Florian Fainelli
2017-03-14 1:06 ` Andrew Lunn
2017-03-14 2:06 ` Doug Berger
[not found] ` <3e5f7ac9-7e97-60f1-3986-4045522a65f5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 2:43 ` Andrew Lunn
[not found] ` <20170314024320.GQ15842-g2DYL2Zd6BY@public.gmane.org>
2017-03-14 17:23 ` Doug Berger
2017-03-14 0:41 ` [PATCH net-next 03/12] net: bcmgenet: simplify circular pointer arithmetic Doug Berger
[not found] ` <20170314004142.4746-4-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:54 ` Florian Fainelli
2017-03-14 0:41 ` Doug Berger [this message]
[not found] ` <20170314004142.4746-5-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:55 ` [PATCH net-next 04/12] net: bcmgenet: remove meaningless lines Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 05/12] net: bcmgenet: manage dma interrupts in napi code Doug Berger
2017-03-14 0:55 ` Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 07/12] net: bcmgenet: clear status to reduce spurious interrupts Doug Berger
[not found] ` <20170314004142.4746-8-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:56 ` Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 08/12] net: bcmgenet: correct return value of __bcmgenet_tx_reclaim Doug Berger
2017-03-14 0:57 ` Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 09/12] net: bcmgenet: return EOPNOTSUPP for unknown ioctl commands Doug Berger
2017-03-14 0:57 ` Florian Fainelli
2017-03-14 11:04 ` David Laight
2017-03-14 17:31 ` Doug Berger
2017-03-14 0:41 ` [PATCH net-next 10/12] dt-bindings: net: document bcmgenet WoL interrupt Doug Berger
[not found] ` <20170314004142.4746-11-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:58 ` Florian Fainelli
2017-03-20 22:09 ` Rob Herring
2017-03-14 0:41 ` [PATCH net-next 11/12] dt-bindings: net: update bcmgenet binding for GENETv5 Doug Berger
2017-03-14 0:58 ` Florian Fainelli
2017-03-14 0:41 ` [PATCH net-next 12/12] net: bcmgenet: add support for the GENETv5 hardware Doug Berger
[not found] ` <20170314004142.4746-13-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:59 ` Florian Fainelli
[not found] ` <20170314004142.4746-1-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:41 ` [PATCH net-next 06/12] net: bcmgenet: remove handling of wol interrupts from isr0 Doug Berger
[not found] ` <20170314004142.4746-7-opendmb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-03-14 0:56 ` Florian Fainelli
2017-03-14 4:53 ` [PATCH net-next 00/12] net: bcmgenet: add support for GENETv5 David Miller
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=20170314004142.4746-5-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=jaedon.shin@gmail.com \
--cc=joel@jms.id.au \
--cc=jon.mason@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pgynther@google.com \
--cc=rafal@milecki.pl \
--cc=robh+dt@kernel.org \
--cc=xow@google.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).