mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Corentin Labbe <clabbe@baylibre.com>
To: davem@davemloft.net, edumazet@google.com, khalasa@piap.pl,
	kuba@kernel.org, pabeni@redhat.com
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH 4/4] net: ethernet: xscale: fix easy remaining style issues
Date: Wed,  5 Oct 2022 12:05:01 +0000	[thread overview]
Message-ID: <20221005120501.3527435-4-clabbe@baylibre.com> (raw)
In-Reply-To: <20221005120501.3527435-1-clabbe@baylibre.com>

Fix all easy remaining styles issues.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 drivers/net/ethernet/xscale/ixp4xx_eth.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 11e5c00f638d..f3732b67cc44 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -356,8 +356,7 @@ static void ixp_tx_timestamp(struct port *port, struct sk_buff *skb)
 
 	regs = port->timesync_regs;
 
-	/*
-	 * This really stinks, but we have to poll for the Tx time stamp.
+	/* This really stinks, but we have to poll for the Tx time stamp.
 	 * Usually, the time stamp is ready after 4 to 6 microseconds.
 	 */
 	for (cnt = 0; cnt < 100; cnt++) {
@@ -653,7 +652,8 @@ static inline void queue_put_desc(unsigned int queue, u32 phys,
 	BUG_ON(phys & 0x1F);
 	qmgr_put_entry(queue, phys);
 	/* Don't check for queue overflow here, we've allocated sufficient
-	   length and queues >= 32 don't support this check anyway. */
+	 * length and queues >= 32 don't support this check anyway.
+	 */
 }
 
 static inline void dma_unmap_tx(struct port *port, struct desc *desc)
@@ -893,7 +893,8 @@ static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
 	port->tx_buff_tab[n] = mem;
 #endif
 	desc->data = phys + offset;
-	desc->buf_len = desc->pkt_len = len;
+	desc->buf_len = len;
+	desc->pkt_len = len;
 
 	/* NPE firmware pads short frames with zeros internally */
 	wmb();
@@ -941,7 +942,7 @@ static void eth_set_mcast_list(struct net_device *dev)
 			__raw_writel(allmulti[i], &port->regs->mcast_mask[i]);
 		}
 		__raw_writel(DEFAULT_RX_CNTRL0 | RX_CNTRL0_ADDR_FLTR_EN,
-			&port->regs->rx_control[0]);
+			     &port->regs->rx_control[0]);
 		return;
 	}
 
@@ -1321,7 +1322,8 @@ static int eth_close(struct net_device *dev)
 			BUG_ON(n < 0);
 			desc = tx_desc_ptr(port, n);
 			phys = tx_desc_phys(port, n);
-			desc->buf_len = desc->pkt_len = 1;
+			desc->buf_len = 1;
+			desc->pkt_len = 1;
 			wmb();
 			queue_put_desc(TX_QUEUE(port->id), phys, desc);
 		}
-- 
2.35.1


  parent reply	other threads:[~2022-10-05 12:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-05 12:04 [PATCH 1/4] net: ethernet: xscale: fix space " Corentin Labbe
2022-10-05 12:04 ` [PATCH 2/4] net: ethernet: xscale: fix printk issues Corentin Labbe
2022-10-05 12:05 ` [PATCH 3/4] net: ethernet: xscale: remove assignment in if condition Corentin Labbe
2022-10-05 12:05 ` Corentin Labbe [this message]
2022-10-06  3:35 ` [PATCH 1/4] net: ethernet: xscale: fix space style issues Jakub Kicinski
2022-10-06  4:40   ` LABBE Corentin
2022-10-06 15:06     ` Jakub Kicinski

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=20221005120501.3527435-4-clabbe@baylibre.com \
    --to=clabbe@baylibre.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=khalasa@piap.pl \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.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

Powered by JetHome