Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b444881 authored by Tobias Klauser's avatar Tobias Klauser Committed by David S. Miller
Browse files

Altera TSE: Fix DMA secriptor length initialization 



sgdma_descrip is a function name as well as the name of a struct. In
sgdma_initialize(), we should initialize the descriptor length field
with the actual length of a descriptor not with the size of the
function. In order to prevent such things from happening in the future,
rename the function to sgdma_setup_descrip().

Found by sparse which yields the following warning:

drivers/net/ethernet/altera/altera_sgdma.c:74:30: warning: expression using sizeof on a function

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 014f1b20

drivers/net/ethernet/altera/altera_sgdma.c

+37 −37
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "altera_sgdmahw.h"

#include "altera_sgdma.h"



static void sgdma_descrip(struct sgdma_descrip *desc,

static void sgdma_setup_descrip(struct sgdma_descrip *desc,

				struct sgdma_descrip *ndesc,

				dma_addr_t ndesc_phys,

				dma_addr_t raddr,
@@ -71,7 +71,7 @@ int sgdma_initialize(struct altera_tse_private *priv) 
		      SGDMA_CTRLREG_INTEN |

		      SGDMA_CTRLREG_ILASTD;



	priv->sgdmadesclen = sizeof(sgdma_descrip);

	priv->sgdmadesclen = sizeof(struct sgdma_descrip);



	INIT_LIST_HEAD(&priv->txlisthd);

	INIT_LIST_HEAD(&priv->rxlisthd);
@@ -195,7 +195,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) 
	if (sgdma_txbusy(priv))

		return 0;



	sgdma_descrip(cdesc,			/* current descriptor */

	sgdma_setup_descrip(cdesc,			/* current descriptor */

			    ndesc,			/* next descriptor */

			    sgdma_txphysaddr(priv, ndesc),

			    buffer->dma_addr,		/* address of packet to xmit */
@@ -309,7 +309,7 @@ u32 sgdma_rx_status(struct altera_tse_private *priv) 




/* Private functions */

static void sgdma_descrip(struct sgdma_descrip *desc,

static void sgdma_setup_descrip(struct sgdma_descrip *desc,

				struct sgdma_descrip *ndesc,

				dma_addr_t ndesc_phys,

				dma_addr_t raddr,
@@ -367,7 +367,7 @@ static int sgdma_async_read(struct altera_tse_private *priv) 
			return 0;

		}



		sgdma_descrip(cdesc,		/* current descriptor */

		sgdma_setup_descrip(cdesc,		/* current descriptor */

				    ndesc,		/* next descriptor */

				    sgdma_rxphysaddr(priv, ndesc),

				    0,			/* read addr 0 for rx dma */