lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 10/13] dmaengine: imx-dma: remove internal structure.
    Date
    This structure was created to allow an smoothless
    merge but was meant to be removed. Remaining members
    'hw_chaining' and 'watchdog' are moved to the channel
    structure.

    Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
    ---
    drivers/dma/imx-dma.c | 64 +++++++++++++-----------------------------------
    1 files changed, 18 insertions(+), 46 deletions(-)
    diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
    index 84ac93b..0b831a7 100644
    --- a/drivers/dma/imx-dma.c
    +++ b/drivers/dma/imx-dma.c
    @@ -110,29 +110,6 @@ enum imxdma_prep_type {
    IMXDMA_DESC_CYCLIC,
    };

    -/*
    - * struct imxdma_channel_internal - i.MX specific DMA extension
    - * @name: name specified by DMA client
    - * @irq_handler: client callback for end of transfer
    - * @err_handler: client callback for error condition
    - * @data: clients context data for callbacks
    - * @dma_mode: direction of the transfer %DMA_MODE_READ or %DMA_MODE_WRITE
    - * @sg: pointer to the actual read/written chunk for scatter-gather emulation
    - * @resbytes: total residual number of bytes to transfer
    - * (it can be lower or same as sum of SG mapped chunk sizes)
    - * @sgcount: number of chunks to be read/written
    - *
    - * Structure is used for IMX DMA processing. It would be probably good
    - * @struct dma_struct in the future for external interfacing and use
    - * @struct imxdma_channel_internal only as extension to it.
    - */
    -
    -struct imxdma_channel_internal {
    - struct timer_list watchdog;
    -
    - int hw_chaining;
    -};
    -
    struct imxdma_desc {
    struct list_head node;
    struct dma_async_tx_descriptor desc;
    @@ -155,7 +132,8 @@ struct imxdma_desc {
    };

    struct imxdma_channel {
    - struct imxdma_channel_internal internal;
    + int hw_chaining;
    + struct timer_list watchdog;
    struct imxdma_engine *imxdma;
    unsigned int channel;

    @@ -215,10 +193,10 @@ static unsigned imx_dmav1_readl(unsigned offset)
    return __raw_readl(imx_dmav1_baseaddr + offset);
    }

    -static int imxdma_hw_chain(struct imxdma_channel_internal *imxdma)
    +static int imxdma_hw_chain(struct imxdma_channel *imxdmac)
    {
    if (cpu_is_mx27())
    - return imxdma->hw_chaining;
    + return imxdmac->hw_chaining;
    else
    return 0;
    }
    @@ -267,7 +245,7 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
    CCR_ACRPT, DMA_CCR(channel));

    if ((cpu_is_mx21() || cpu_is_mx27()) &&
    - d->sg && imxdma_hw_chain(&imxdmac->internal)) {
    + d->sg && imxdma_hw_chain(imxdmac)) {
    d->sg = sg_next(d->sg);
    if (d->sg) {
    u32 tmp;
    @@ -288,8 +266,8 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)

    pr_debug("imxdma%d: imx_dma_disable\n", channel);

    - if (imxdma_hw_chain(&imxdmac->internal))
    - del_timer(&imxdmac->internal.watchdog);
    + if (imxdma_hw_chain(imxdmac))
    + del_timer(&imxdmac->watchdog);

    local_irq_save(flags);
    imx_dmav1_writel(imx_dmav1_readl(DMA_DIMR) | (1 << channel), DMA_DIMR);
    @@ -314,7 +292,6 @@ static void imxdma_watchdog(unsigned long data)
    static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
    {
    struct imxdma_engine *imxdma = dev_id;
    - struct imxdma_channel_internal *internal;
    unsigned int err_mask;
    int i, disr;
    int errcode;
    @@ -334,7 +311,6 @@ static irqreturn_t imxdma_err_handler(int irq, void *dev_id)
    for (i = 0; i < IMX_DMA_CHANNELS; i++) {
    if (!(err_mask & (1 << i)))
    continue;
    - internal = &imxdma->channel[i].internal;
    errcode = 0;

    if (imx_dmav1_readl(DMA_DBTOSR) & (1 << i)) {
    @@ -368,7 +344,6 @@ static irqreturn_t imxdma_err_handler(int irq, void *dev_id)

    static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
    {
    - struct imxdma_channel_internal *imxdma = &imxdmac->internal;
    int chno = imxdmac->channel;
    struct imxdma_desc *desc;

    @@ -392,11 +367,11 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)

    tmp = imx_dmav1_readl(DMA_CCR(chno));

    - if (imxdma_hw_chain(imxdma)) {
    + if (imxdma_hw_chain(imxdmac)) {
    /* FIXME: The timeout should probably be
    * configurable
    */
    - mod_timer(&imxdma->watchdog,
    + mod_timer(&imxdmac->watchdog,
    jiffies + msecs_to_jiffies(500));

    tmp |= CCR_CEN | CCR_RPT | CCR_ACRPT;
    @@ -415,8 +390,8 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
    return;
    }

    - if (imxdma_hw_chain(imxdma)) {
    - del_timer(&imxdma->watchdog);
    + if (imxdma_hw_chain(imxdmac)) {
    + del_timer(&imxdmac->watchdog);
    return;
    }
    }
    @@ -430,7 +405,6 @@ out:
    static irqreturn_t dma_irq_handler(int irq, void *dev_id)
    {
    struct imxdma_engine *imxdma = dev_id;
    - struct imxdma_channel_internal *internal;
    int i, disr;

    if (cpu_is_mx21() || cpu_is_mx27())
    @@ -443,10 +417,8 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)

    imx_dmav1_writel(disr, DMA_DISR);
    for (i = 0; i < IMX_DMA_CHANNELS; i++) {
    - if (disr & (1 << i)) {
    - internal = &imxdma->channel[i].internal;
    + if (disr & (1 << i))
    dma_irq_handle_channel(&imxdma->channel[i]);
    - }
    }

    return IRQ_HANDLED;
    @@ -589,8 +561,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
    break;
    }

    - imxdmac->internal.hw_chaining = 1;
    - if (!imxdma_hw_chain(&imxdmac->internal))
    + imxdmac->hw_chaining = 1;
    + if (!imxdma_hw_chain(imxdmac))
    return -EINVAL;
    imxdmac->ccr_from_device = (mode | IMX_DMA_TYPE_FIFO) |
    ((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) |
    @@ -942,7 +914,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
    /* Initialize channel parameters */
    for (i = 0; i < IMX_DMA_CHANNELS; i++) {
    struct imxdma_channel *imxdmac = &imxdma->channel[i];
    - memset(&imxdmac->internal, 0, sizeof(imxdmac->internal));
    +
    if (cpu_is_mx21() || cpu_is_mx27()) {
    ret = request_irq(MX2x_INT_DMACH0 + i,
    dma_irq_handler, 0, "DMA", imxdma);
    @@ -951,9 +923,9 @@ static int __init imxdma_probe(struct platform_device *pdev)
    MX2x_INT_DMACH0 + i, i);
    goto err_init;
    }
    - init_timer(&imxdmac->internal.watchdog);
    - imxdmac->internal.watchdog.function = &imxdma_watchdog;
    - imxdmac->internal.watchdog.data = (unsigned long)imxdmac;
    + init_timer(&imxdmac->watchdog);
    + imxdmac->watchdog.function = &imxdma_watchdog;
    + imxdmac->watchdog.data = (unsigned long)imxdmac;
    }

    imxdmac->imxdma = imxdma;
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-03-09 16:29    [from the cache]
    ©2003-2011 Jasper Spaans