staging: brcm80211: remove iovars IOV_DMA

Remove unused sdio related iovars IOV_DMA for fullmac driver

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 4b13f4237a2550db08da04eee56b8e1a6b92f854..a0f24637e3ad38d7f1e43c07f233a1a0b5c9c2a4 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -54,7 +54,6 @@ uint sd_power = 1;            /* Default to SD Slot powered ON */
 uint sd_clock = 1;             /* Default to SD Clock turned ON */
 uint sd_hiok = false;          /* Don't use hi-speed mode by default */
 uint sd_msglevel = 0x01;
-uint sd_use_dma = true;
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_word_wait);
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait);
@@ -352,7 +351,6 @@ uint sdioh_query_iofnum(sdioh_info_t *sd)
 enum {
        IOV_MSGLEVEL = 1,
        IOV_BLOCKSIZE,
-       IOV_DMA,
        IOV_USEINTS,
        IOV_NUMINTS,
        IOV_NUMLOCALINTS,
@@ -371,7 +369,6 @@ const bcm_iovar_t sdioh_iovars[] = {
        {"sd_msglevel", IOV_MSGLEVEL, 0, IOVT_UINT32, 0},
        {"sd_blocksize", IOV_BLOCKSIZE, 0, IOVT_UINT32, 0},/* ((fn << 16) |
                                                                 size) */
-       {"sd_dma", IOV_DMA, 0, IOVT_BOOL, 0},
        {"sd_ints", IOV_USEINTS, 0, IOVT_BOOL, 0},
        {"sd_numints", IOV_NUMINTS, 0, IOVT_UINT32, 0},
        {"sd_numlocalints", IOV_NUMLOCALINTS, 0, IOVT_UINT32, 0},
@@ -505,15 +502,6 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
                memcpy(arg, &int_val, val_size);
                break;
 
-       case IOV_GVAL(IOV_DMA):
-               int_val = (s32) si->sd_use_dma;
-               memcpy(arg, &int_val, val_size);
-               break;
-
-       case IOV_SVAL(IOV_DMA):
-               si->sd_use_dma = (bool) int_val;
-               break;
-
        case IOV_GVAL(IOV_USEINTS):
                int_val = (s32) si->use_client_ints;
                memcpy(arg, &int_val, val_size);

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
index 3ef42b318493ec0bb8bcf09638e6c7ae19ae0d49..86f88bf9a259a5d771521ea34b12f0c03a56d7fd 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
@@ -85,7 +85,6 @@ struct sdioh_info {
 
        uint irq;               /* Client irq */
        int intrcount;          /* Client interrupts */
-       bool sd_use_dma;        /* DMA on CMD53 */
        bool sd_blockmode;      /* sd_blockmode == false => 64 Byte Cmd 53s. */
        /*  Must be on for sd_multiblock to be effective */
        bool use_client_ints;   /* If this is false, make sure to restore */