staging: mt7621-mmc: Remove unused field burstsz from msdc_dma

The burstsz field in msdc_dma is set to a constant value and later
only used two times, using the constant directly in that places allows
to remove the field and improves readability.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/mt7621-mmc/mt6575_sd.h b/drivers/staging/mt7621-mmc/mt6575_sd.h
index f6daaf69bcab29148c7f013270a12fa74a527785..6a08b2651e70afc3d77ae018f5a7ca652ecd5a12 100644 (file)
--- a/drivers/staging/mt7621-mmc/mt6575_sd.h
+++ b/drivers/staging/mt7621-mmc/mt6575_sd.h
@@ -909,7 +909,6 @@ struct msdc_dma {
        struct scatterlist *sg;      /* I/O scatter list */
        struct scatterlist_ex *esg;  /* extended I/O scatter list */
        u8  mode;                    /* dma mode        */
-       u8  burstsz;                 /* burst size      */
        u8  intr;                    /* dma done interrupt */
        u8  padding;                 /* padding */
        u32 cmd;                     /* enhanced mode command */

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 43a59da5b4182bbb7bae3d5376ee9de741a5f152..db3abc5dad47872ca37866d2e5770e30d8bb194b 100644 (file)
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -1338,7 +1338,8 @@ static int msdc_dma_config(struct msdc_host *host, struct msdc_dma *dma)
                else
                        sdr_write32((volatile u32 *)(RALINK_MSDC_BASE + 0xa8), sg_dma_len(sg));
 //#endif
-               sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_BRUSTSZ, dma->burstsz);
+               sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_BRUSTSZ,
+                             MSDC_BRUST_64B);
                sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_MODE, 0);
                break;
        case MSDC_MODE_DMA_DESC:
@@ -1377,7 +1378,8 @@ static int msdc_dma_config(struct msdc_host *host, struct msdc_dma *dma)
                dma->used_bd += bdlen;
 
                sdr_set_field(MSDC_DMA_CFG, MSDC_DMA_CFG_DECSEN, chksum);
-               sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_BRUSTSZ, dma->burstsz);
+               sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_BRUSTSZ,
+                             MSDC_BRUST_64B);
                sdr_set_field(MSDC_DMA_CTRL, MSDC_DMA_CTRL_MODE, 1);
 
                sdr_write32(MSDC_DMA_SA, PHYSADDR((u32)dma->gpd_addr));
@@ -1404,7 +1406,6 @@ static void msdc_dma_setup(struct msdc_host *host, struct msdc_dma *dma,
        //dma->flags = DMA_FLAG_NONE; /* CHECKME */
        dma->sglen = sglen;
        dma->xfersz = host->xfer_size;
-       dma->burstsz = MSDC_BRUST_64B;
 
        if (sglen == 1 && sg_dma_len(sg) <= MAX_DMA_CNT)
                dma->mode = MSDC_MODE_DMA_BASIC;