Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 16 May 2014 12:08:43 +1000

Hi all,

Today's linux-next merge of the net-next tree got conflicts in
drivers/net/ethernet/altera/altera_msgdma.c and
drivers/net/ethernet/altera/altera_sgdma.c between commit 898305806ad5
("Altera TSE: Fix sparse errors and warnings") from the net tree and
commit d42f157b3498 ("Altera TSE: Remove unnecessary cast of void
pointers") from the net-next tree.

I fixed it up (mostly the former removed lines updated by the latter,
but see below) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/ethernet/altera/altera_sgdma.c
index 99cc56f451cf,dbd40e15b5cc..000000000000
--- a/drivers/net/ethernet/altera/altera_sgdma.c
+++ b/drivers/net/ethernet/altera/altera_sgdma.c
@@@ -179,11 -184,11 +179,10 @@@ void sgdma_clear_txirq(struct altera_ts
   */
  int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
  {
- 	struct sgdma_descrip __iomem *descbase =
- 		(struct sgdma_descrip __iomem *)priv->tx_dma_desc;
 -	int pktstx = 0;
 -	struct sgdma_descrip *descbase = priv->tx_dma_desc;
++	struct sgdma_descrip __iomem *descbase = priv->tx_dma_desc;
  
 -	struct sgdma_descrip *cdesc = &descbase[0];
 -	struct sgdma_descrip *ndesc = &descbase[1];
 +	struct sgdma_descrip __iomem *cdesc = &descbase[0];
 +	struct sgdma_descrip __iomem *ndesc = &descbase[1];
  
  	/* wait 'til the tx sgdma is ready for the next transmit request */
  	if (sgdma_txbusy(priv))
@@@ -240,13 -245,16 +239,12 @@@ void sgdma_add_rx_desc(struct altera_ts
   */
  u32 sgdma_rx_status(struct altera_tse_private *priv)
  {
- 	struct sgdma_descrip __iomem *base =
- 		(struct sgdma_descrip __iomem *)priv->rx_dma_desc;
 -	struct sgdma_csr *csr = priv->rx_dma_csr;
 -	struct sgdma_descrip *base = priv->rx_dma_desc;
 -	struct sgdma_descrip *desc = NULL;
 -	int pktsrx;
 -	unsigned int rxstatus = 0;
 -	unsigned int pktlength = 0;
 -	unsigned int pktstatus = 0;
++	struct sgdma_descrip __iomem *base = priv->rx_dma_desc;
 +	struct sgdma_descrip __iomem *desc = NULL;
  	struct tse_buffer *rxbuffer = NULL;
 +	unsigned int rxstatus = 0;
  
 -	u32 sts = ioread32(&csr->status);
 +	u32 sts = csrrd32(priv->rx_dma_csr, sgdma_csroffs(status));
  
  	desc = &base[0];
  	if (sts & SGDMA_STSREG_EOP) {
@@@ -348,11 -350,10 +346,10 @@@ static void sgdma_setup_descrip(struct 
   */
  static int sgdma_async_read(struct altera_tse_private *priv)
  {
- 	struct sgdma_descrip __iomem *descbase =
- 		(struct sgdma_descrip __iomem *)priv->rx_dma_desc;
 -	struct sgdma_csr *csr = priv->rx_dma_csr;
 -	struct sgdma_descrip *descbase = priv->rx_dma_desc;
 -	struct sgdma_descrip *cdesc = &descbase[0];
 -	struct sgdma_descrip *ndesc = &descbase[1];
++	struct sgdma_descrip __iomem *descbase = priv->rx_dma_desc;
 +
 +	struct sgdma_descrip __iomem *cdesc = &descbase[0];
 +	struct sgdma_descrip __iomem *ndesc = &descbase[1];
  
  	struct tse_buffer *rxbuffer = NULL;