mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
014f1b2010
commit
1b4448815e
1 changed files with 37 additions and 37 deletions
|
@ -20,15 +20,15 @@
|
|||
#include "altera_sgdmahw.h"
|
||||
#include "altera_sgdma.h"
|
||||
|
||||
static void sgdma_descrip(struct sgdma_descrip *desc,
|
||||
struct sgdma_descrip *ndesc,
|
||||
dma_addr_t ndesc_phys,
|
||||
dma_addr_t raddr,
|
||||
dma_addr_t waddr,
|
||||
u16 length,
|
||||
int generate_eop,
|
||||
int rfixed,
|
||||
int wfixed);
|
||||
static void sgdma_setup_descrip(struct sgdma_descrip *desc,
|
||||
struct sgdma_descrip *ndesc,
|
||||
dma_addr_t ndesc_phys,
|
||||
dma_addr_t raddr,
|
||||
dma_addr_t waddr,
|
||||
u16 length,
|
||||
int generate_eop,
|
||||
int rfixed,
|
||||
int wfixed);
|
||||
|
||||
static int sgdma_async_write(struct altera_tse_private *priv,
|
||||
struct sgdma_descrip *desc);
|
||||
|
@ -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,15 +195,15 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer)
|
|||
if (sgdma_txbusy(priv))
|
||||
return 0;
|
||||
|
||||
sgdma_descrip(cdesc, /* current descriptor */
|
||||
ndesc, /* next descriptor */
|
||||
sgdma_txphysaddr(priv, ndesc),
|
||||
buffer->dma_addr, /* address of packet to xmit */
|
||||
0, /* write addr 0 for tx dma */
|
||||
buffer->len, /* length of packet */
|
||||
SGDMA_CONTROL_EOP, /* Generate EOP */
|
||||
0, /* read fixed */
|
||||
SGDMA_CONTROL_WR_FIXED); /* Generate SOP */
|
||||
sgdma_setup_descrip(cdesc, /* current descriptor */
|
||||
ndesc, /* next descriptor */
|
||||
sgdma_txphysaddr(priv, ndesc),
|
||||
buffer->dma_addr, /* address of packet to xmit */
|
||||
0, /* write addr 0 for tx dma */
|
||||
buffer->len, /* length of packet */
|
||||
SGDMA_CONTROL_EOP, /* Generate EOP */
|
||||
0, /* read fixed */
|
||||
SGDMA_CONTROL_WR_FIXED); /* Generate SOP */
|
||||
|
||||
pktstx = sgdma_async_write(priv, cdesc);
|
||||
|
||||
|
@ -309,15 +309,15 @@ u32 sgdma_rx_status(struct altera_tse_private *priv)
|
|||
|
||||
|
||||
/* Private functions */
|
||||
static void sgdma_descrip(struct sgdma_descrip *desc,
|
||||
struct sgdma_descrip *ndesc,
|
||||
dma_addr_t ndesc_phys,
|
||||
dma_addr_t raddr,
|
||||
dma_addr_t waddr,
|
||||
u16 length,
|
||||
int generate_eop,
|
||||
int rfixed,
|
||||
int wfixed)
|
||||
static void sgdma_setup_descrip(struct sgdma_descrip *desc,
|
||||
struct sgdma_descrip *ndesc,
|
||||
dma_addr_t ndesc_phys,
|
||||
dma_addr_t raddr,
|
||||
dma_addr_t waddr,
|
||||
u16 length,
|
||||
int generate_eop,
|
||||
int rfixed,
|
||||
int wfixed)
|
||||
{
|
||||
/* Clear the next descriptor as not owned by hardware */
|
||||
u32 ctrl = ndesc->control;
|
||||
|
@ -367,15 +367,15 @@ static int sgdma_async_read(struct altera_tse_private *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
sgdma_descrip(cdesc, /* current descriptor */
|
||||
ndesc, /* next descriptor */
|
||||
sgdma_rxphysaddr(priv, ndesc),
|
||||
0, /* read addr 0 for rx dma */
|
||||
rxbuffer->dma_addr, /* write addr for rx dma */
|
||||
0, /* read 'til EOP */
|
||||
0, /* EOP: NA for rx dma */
|
||||
0, /* read fixed: NA for rx dma */
|
||||
0); /* SOP: NA for rx DMA */
|
||||
sgdma_setup_descrip(cdesc, /* current descriptor */
|
||||
ndesc, /* next descriptor */
|
||||
sgdma_rxphysaddr(priv, ndesc),
|
||||
0, /* read addr 0 for rx dma */
|
||||
rxbuffer->dma_addr, /* write addr for rx dma */
|
||||
0, /* read 'til EOP */
|
||||
0, /* EOP: NA for rx dma */
|
||||
0, /* read fixed: NA for rx dma */
|
||||
0); /* SOP: NA for rx DMA */
|
||||
|
||||
dma_sync_single_for_device(priv->device,
|
||||
priv->rxdescphys,
|
||||
|
|
Loading…
Reference in a new issue