lkml.org 
[lkml]   [2016]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 002/116] usb: musb: cppi41: correct the macro name EP_MODE_AUTOREG_*
    Date
    From: Bin Liu <b-liu@ti.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 0149b07a9e28b0d8bd2fc1c238ffe7d530c2673f upstream.

    The macro EP_MODE_AUTOREG_* should be called EP_MODE_AUTOREQ_*, as they
    are used for register AUTOREQ.

    Signed-off-by: Bin Liu <b-liu@ti.com>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/musb/musb_cppi41.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c
    index 2ed1695ff5ad..cce32e91fd9e 100644
    --- a/drivers/usb/musb/musb_cppi41.c
    +++ b/drivers/usb/musb/musb_cppi41.c
    @@ -9,9 +9,9 @@

    #define RNDIS_REG(x) (0x80 + ((x - 1) * 4))

    -#define EP_MODE_AUTOREG_NONE 0
    -#define EP_MODE_AUTOREG_ALL_NEOP 1
    -#define EP_MODE_AUTOREG_ALWAYS 3
    +#define EP_MODE_AUTOREQ_NONE 0
    +#define EP_MODE_AUTOREQ_ALL_NEOP 1
    +#define EP_MODE_AUTOREQ_ALWAYS 3

    #define EP_MODE_DMA_TRANSPARENT 0
    #define EP_MODE_DMA_RNDIS 1
    @@ -376,19 +376,19 @@ static bool cppi41_configure_channel(struct dma_channel *channel,

    /* auto req */
    cppi41_set_autoreq_mode(cppi41_channel,
    - EP_MODE_AUTOREG_ALL_NEOP);
    + EP_MODE_AUTOREQ_ALL_NEOP);
    } else {
    musb_writel(musb->ctrl_base,
    RNDIS_REG(cppi41_channel->port_num), 0);
    cppi41_set_dma_mode(cppi41_channel,
    EP_MODE_DMA_TRANSPARENT);
    cppi41_set_autoreq_mode(cppi41_channel,
    - EP_MODE_AUTOREG_NONE);
    + EP_MODE_AUTOREQ_NONE);
    }
    } else {
    /* fallback mode */
    cppi41_set_dma_mode(cppi41_channel, EP_MODE_DMA_TRANSPARENT);
    - cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREG_NONE);
    + cppi41_set_autoreq_mode(cppi41_channel, EP_MODE_AUTOREQ_NONE);
    len = min_t(u32, packet_sz, len);
    }
    cppi41_channel->prog_len = len;
    --
    2.7.2
    \
     
     \ /
      Last update: 2016-03-04 11:01    [W:4.224 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site