diff mbox

[2/9] bnx2x: annotate struct eth_tx_db_data

Message ID 1232517047.9701.20.camel@brick
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Harvey Harrison Jan. 21, 2009, 5:50 a.m. UTC 
Always treated as little-endian values, annotate as such, use
the leXX_add_cpu helpers rather than opencoded byteswapping.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 drivers/net/bnx2x_hsi.h  |    4 ++--
 drivers/net/bnx2x_main.c |   12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

Comments

Eilon Greenstein Jan. 22, 2009, 5:49 p.m. UTC | #1 
On Tue, 2009-01-20 at 21:50 -0800, Harvey Harrison wrote:
> Always treated as little-endian values, annotate as such, use
> the leXX_add_cpu helpers rather than opencoded byteswapping.
> 
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>

The next few patches are similar, and I feel more comfortable combining
them. I will try to follow your lead and will work on a suggestion that
will complete this task in the next couple of days. I rather not to
submit it half-backed.

Thanks,
Eilon


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h
index efd7644..a3c1068 100644
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x_hsi.h
@@ -2355,8 +2355,8 @@  struct eth_spe {
  * doorbell data in host memory
  */
 struct eth_tx_db_data {
-	u32 packets_prod;
-	u16 bds_prod;
+	__le32 packets_prod;
+	__le16 bds_prod;
 	u16 reserved;
 };
 
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 897f370..2f8d64c 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -8774,11 +8774,9 @@  static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
 
 	wmb();
 
-	fp->hw_tx_prods->bds_prod =
-		cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + 1);
+	le16_add_cpu(&fp->hw_tx_prods->bds_prod, 1);
 	mb(); /* FW restriction: must not reorder writing nbd and packets */
-	fp->hw_tx_prods->packets_prod =
-		cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
+	le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1);
 	DOORBELL(bp, fp->index, 0);
 
 	mmiowb();
@@ -9774,11 +9772,9 @@  static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 */
 	wmb();
 
-	fp->hw_tx_prods->bds_prod =
-		cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd);
+	le16_add_cpu(&fp->hw_tx_prods->bds_prod, nbd);
 	mb(); /* FW restriction: must not reorder writing nbd and packets */
-	fp->hw_tx_prods->packets_prod =
-		cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
+	le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1);
 	DOORBELL(bp, fp->index, 0);
 
 	mmiowb();