lkml.org 
[lkml]   [2011]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[MXS MMC v2 2/4] Some cleanups for the MMC driver
    Date
     - Remove bogus parens around numerical arguments in #define's
    - When defining bit masks, use the #def for the shift count
    instead of repeating the numbers
    - Remove 'break' at end of switch statement

    Changes wrt v1:
    - break long lines
    - leave indentation as is

    Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
    ---
    drivers/mmc/host/mxs-mmc.c | 60 ++++++++++++++++++++++++---------------------
    1 file changed, 32 insertions(+), 28 deletions(-)
    diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
    index 99b449d..a9b70d2 100644
    --- a/drivers/mmc/host/mxs-mmc.c
    +++ b/drivers/mmc/host/mxs-mmc.c
    @@ -47,7 +47,7 @@
    #define DRIVER_NAME "mxs-mmc"

    /* card detect polling timeout */
    -#define MXS_MMC_DETECT_TIMEOUT (HZ/2)
    +#define MXS_MMC_DETECT_TIMEOUT (HZ / 2)

    #define SSP_VERSION_LATEST 4
    #define ssp_is_old() (host->version < SSP_VERSION_LATEST)
    @@ -59,39 +59,43 @@
    #define BM_SSP_CTRL0_IGNORE_CRC (1 << 26)
    #define BM_SSP_CTRL0_READ (1 << 25)
    #define BM_SSP_CTRL0_DATA_XFER (1 << 24)
    -#define BP_SSP_CTRL0_BUS_WIDTH (22)
    -#define BM_SSP_CTRL0_BUS_WIDTH (0x3 << 22)
    +#define BP_SSP_CTRL0_BUS_WIDTH 22
    +#define BM_SSP_CTRL0_BUS_WIDTH (0x3 << BP_SSP_CTRL0_BUS_WIDTH)
    #define BM_SSP_CTRL0_WAIT_FOR_IRQ (1 << 21)
    #define BM_SSP_CTRL0_LONG_RESP (1 << 19)
    #define BM_SSP_CTRL0_GET_RESP (1 << 17)
    #define BM_SSP_CTRL0_ENABLE (1 << 16)
    -#define BP_SSP_CTRL0_XFER_COUNT (0)
    -#define BM_SSP_CTRL0_XFER_COUNT (0xffff)
    +#define BP_SSP_CTRL0_XFER_COUNT 0
    +#define BM_SSP_CTRL0_XFER_COUNT 0xffff
    #define HW_SSP_CMD0 0x010
    #define BM_SSP_CMD0_DBL_DATA_RATE_EN (1 << 25)
    #define BM_SSP_CMD0_SLOW_CLKING_EN (1 << 22)
    #define BM_SSP_CMD0_CONT_CLKING_EN (1 << 21)
    #define BM_SSP_CMD0_APPEND_8CYC (1 << 20)
    -#define BP_SSP_CMD0_BLOCK_SIZE (16)
    -#define BM_SSP_CMD0_BLOCK_SIZE (0xf << 16)
    -#define BP_SSP_CMD0_BLOCK_COUNT (8)
    -#define BM_SSP_CMD0_BLOCK_COUNT (0xff << 8)
    -#define BP_SSP_CMD0_CMD (0)
    -#define BM_SSP_CMD0_CMD (0xff)
    +#define BP_SSP_CMD0_BLOCK_SIZE 16
    +#define BM_SSP_CMD0_BLOCK_SIZE (0xf << BP_SSP_CMD0_BLOCK_SIZE)
    +#define BP_SSP_CMD0_BLOCK_COUNT 8
    +#define BM_SSP_CMD0_BLOCK_COUNT \
    + (0xff << BP_SSP_CMD0_BLOCK_COUNT)
    +#define BP_SSP_CMD0_CMD 0
    +#define BM_SSP_CMD0_CMD 0xff
    #define HW_SSP_CMD1 0x020
    #define HW_SSP_XFER_SIZE 0x030
    #define HW_SSP_BLOCK_SIZE 0x040
    -#define BP_SSP_BLOCK_SIZE_BLOCK_COUNT (4)
    -#define BM_SSP_BLOCK_SIZE_BLOCK_COUNT (0xffffff << 4)
    -#define BP_SSP_BLOCK_SIZE_BLOCK_SIZE (0)
    -#define BM_SSP_BLOCK_SIZE_BLOCK_SIZE (0xf)
    +#define BP_SSP_BLOCK_SIZE_BLOCK_COUNT 4
    +#define BM_SSP_BLOCK_SIZE_BLOCK_COUNT \
    + (0xffffff << BP_SSP_BLOCK_SIZE_BLOCK_COUNT)
    +#define BP_SSP_BLOCK_SIZE_BLOCK_SIZE 0
    +#define BM_SSP_BLOCK_SIZE_BLOCK_SIZE 0xf
    #define HW_SSP_TIMING (ssp_is_old() ? 0x050 : 0x070)
    -#define BP_SSP_TIMING_TIMEOUT (16)
    -#define BM_SSP_TIMING_TIMEOUT (0xffff << 16)
    -#define BP_SSP_TIMING_CLOCK_DIVIDE (8)
    -#define BM_SSP_TIMING_CLOCK_DIVIDE (0xff << 8)
    -#define BP_SSP_TIMING_CLOCK_RATE (0)
    -#define BM_SSP_TIMING_CLOCK_RATE (0xff)
    +#define BP_SSP_TIMING_TIMEOUT 16
    +#define BM_SSP_TIMING_TIMEOUT \
    + (0xffff << BP_SSP_TIMING_TIMEOUT)
    +#define BP_SSP_TIMING_CLOCK_DIVIDE 8
    +#define BM_SSP_TIMING_CLOCK_DIVIDE \
    + (0xff << BP_SSP_TIMING_CLOCK_DIVIDE)
    +#define BP_SSP_TIMING_CLOCK_RATE 0
    +#define BM_SSP_TIMING_CLOCK_RATE 0xff
    #define HW_SSP_CTRL1 (ssp_is_old() ? 0x060 : 0x080)
    #define BM_SSP_CTRL1_SDIO_IRQ (1 << 31)
    #define BM_SSP_CTRL1_SDIO_IRQ_EN (1 << 30)
    @@ -111,10 +115,11 @@
    #define BM_SSP_CTRL1_FIFO_OVERRUN_IRQ_EN (1 << 14)
    #define BM_SSP_CTRL1_DMA_ENABLE (1 << 13)
    #define BM_SSP_CTRL1_POLARITY (1 << 9)
    -#define BP_SSP_CTRL1_WORD_LENGTH (4)
    -#define BM_SSP_CTRL1_WORD_LENGTH (0xf << 4)
    -#define BP_SSP_CTRL1_SSP_MODE (0)
    -#define BM_SSP_CTRL1_SSP_MODE (0xf)
    +#define BP_SSP_CTRL1_WORD_LENGTH 4
    +#define BM_SSP_CTRL1_WORD_LENGTH \
    + (0xf << BP_SSP_CTRL1_WORD_LENGTH)
    +#define BP_SSP_CTRL1_SSP_MODE 0
    +#define BM_SSP_CTRL1_SSP_MODE 0xf
    #define HW_SSP_SDRESP0 (ssp_is_old() ? 0x080 : 0x0a0)
    #define HW_SSP_SDRESP1 (ssp_is_old() ? 0x090 : 0x0b0)
    #define HW_SSP_SDRESP2 (ssp_is_old() ? 0x0a0 : 0x0c0)
    @@ -123,7 +128,7 @@
    #define BM_SSP_STATUS_CARD_DETECT (1 << 28)
    #define BM_SSP_STATUS_SDIO_IRQ (1 << 17)
    #define HW_SSP_VERSION (cpu_is_mx23() ? 0x110 : 0x130)
    -#define BP_SSP_VERSION_MAJOR (24)
    +#define BP_SSP_VERSION_MAJOR 24

    #define BF_SSP(value, field) (((value) << BP_SSP_##field) & BM_SSP_##field)

    @@ -151,7 +156,7 @@ struct mxs_mmc_host {
    struct clk *clk;
    unsigned int clk_rate;

    - struct dma_chan *dmach;
    + struct dma_chan *dmach;
    struct mxs_dma_data dma_data;
    unsigned int dma_dir;
    u32 ssp_pio_words[SSP_PIO_NUM];
    @@ -550,7 +555,6 @@ static void mxs_mmc_start_cmd(struct mxs_mmc_host *host,
    default:
    dev_warn(mmc_dev(host->mmc),
    "%s: unknown MMC command\n", __func__);
    - break;
    }
    }

    --
    1.5.6.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-12-08 09:21    [W:0.028 / U:29.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site