net: eth: altera: Remove sgdmadesclen member from altera_tse_private

altera_tse_private->sgdmadesclen is always assigned assigned the same
value and never changes during runtime.  Remove the struct member and
use a new define for sizeof(struct sgdma_descrip) instead.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c
index 580553d42d34fd773139cda6076f00d7bc40cce1..88ef67a998b4eed939b00a3c0120648fad02b5d7 100644 (file)
--- a/drivers/net/ethernet/altera/altera_sgdma.c
+++ b/drivers/net/ethernet/altera/altera_sgdma.c
@@ -71,8 +71,6 @@ int sgdma_initialize(struct altera_tse_private *priv)
                      SGDMA_CTRLREG_INTEN |
                      SGDMA_CTRLREG_ILASTD;
 
-       priv->sgdmadesclen = sizeof(struct sgdma_descrip);
-
        INIT_LIST_HEAD(&priv->txlisthd);
        INIT_LIST_HEAD(&priv->rxlisthd);
 
@@ -254,7 +252,7 @@ u32 sgdma_rx_status(struct altera_tse_private *priv)
                unsigned int pktstatus = 0;
                dma_sync_single_for_cpu(priv->device,
                                        priv->rxdescphys,
-                                       priv->sgdmadesclen,
+                                       SGDMA_DESC_LEN,
                                        DMA_FROM_DEVICE);
 
                pktlength = csrrd16(desc, sgdma_descroffs(bytes_xferred));
@@ -374,7 +372,7 @@ static int sgdma_async_read(struct altera_tse_private *priv)
 
                dma_sync_single_for_device(priv->device,
                                           priv->rxdescphys,
-                                          priv->sgdmadesclen,
+                                          SGDMA_DESC_LEN,
                                           DMA_TO_DEVICE);
 
                csrwr32(lower_32_bits(sgdma_rxphysaddr(priv, cdesc)),
@@ -402,7 +400,7 @@ static int sgdma_async_write(struct altera_tse_private *priv,
        csrwr32(0x1f, priv->tx_dma_csr, sgdma_csroffs(status));
 
        dma_sync_single_for_device(priv->device, priv->txdescphys,
-                                  priv->sgdmadesclen, DMA_TO_DEVICE);
+                                  SGDMA_DESC_LEN, DMA_TO_DEVICE);
 
        csrwr32(lower_32_bits(sgdma_txphysaddr(priv, desc)),
                priv->tx_dma_csr,

diff --git a/drivers/net/ethernet/altera/altera_sgdmahw.h b/drivers/net/ethernet/altera/altera_sgdmahw.h
index 85bc33b218d946f557647d1a73f9699e3189827b..bbd52f02330b204aa0838ecd589a4f2a32252759 100644 (file)
--- a/drivers/net/ethernet/altera/altera_sgdmahw.h
+++ b/drivers/net/ethernet/altera/altera_sgdmahw.h
@@ -50,6 +50,7 @@ struct sgdma_descrip {
        u8      control;
 } __packed;
 
+#define SGDMA_DESC_LEN sizeof(struct sgdma_descrip)
 
 #define SGDMA_STATUS_ERR               BIT(0)
 #define SGDMA_STATUS_LENGTH_ERR                BIT(1)

diff --git a/drivers/net/ethernet/altera/altera_tse.h b/drivers/net/ethernet/altera/altera_tse.h
index 2adb24d4523c915d3b7d87f1294ead36757cea50..103c30ddddf7004c4ea41285c19cfaebc0843817 100644 (file)
--- a/drivers/net/ethernet/altera/altera_tse.h
+++ b/drivers/net/ethernet/altera/altera_tse.h
@@ -458,7 +458,6 @@ struct altera_tse_private {
        u32 rxctrlreg;
        dma_addr_t rxdescphys;
        dma_addr_t txdescphys;
-       size_t sgdmadesclen;
 
        struct list_head txlisthd;
        struct list_head rxlisthd;