From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch 1/2 -next] cxgb4: clean up a type issue Date: Thu, 2 Oct 2014 14:22:19 +0300 Message-ID: <20141002112219.GA25606@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org To: Hariprasad S Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:31131 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbaJBLWd (ORCPT ); Thu, 2 Oct 2014 07:22:33 -0400 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: The tx_desc struct hold 8 __be64 values. The original code took a tx_desc pointer then casted it to an int pointer and then casted it to a u64 pointer. It was confusing and triggered some static checker warnings. I have changed the cxgb_pio_copy() to only take tx_desc pointers. This isn't really a loss of flexibility because anything else was buggy to begin with. Signed-off-by: Dan Carpenter diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c index bb7851e..599cdfd 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -854,9 +854,10 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q, * memory mapped BAR2 space(user space writes). * For coalesced WR SGE, fetches data from the FIFO instead of from Host. */ -static void cxgb_pio_copy(u64 __iomem *dst, u64 *src) +static void cxgb_pio_copy(u64 __iomem *dst, struct tx_desc *desc) { - int count = 8; + int count = sizeof(*desc) / sizeof(u64); + u64 *src = (u64 *)desc; while (count) { writeq(*src, dst); @@ -914,12 +915,11 @@ static inline void ring_tx_db(struct adapter *adap, struct sge_txq *q, int n) int index = (q->pidx ? (q->pidx - 1) : (q->size - 1)); - unsigned int *wr = (unsigned int *)&q->desc[index]; + struct tx_desc *desc = &q->desc[index]; cxgb_pio_copy((u64 __iomem *) (adap->bar2 + q->udb + - SGE_UDB_WCDOORBELL), - (u64 *)wr); + SGE_UDB_WCDOORBELL), desc); } else { writel(val, adap->bar2 + q->udb + SGE_UDB_KDOORBELL); }