lkml.org 
[lkml]   [2013]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/16] usb: musb: remove a few is_dma_capable() in init/exit code
    Date
    This patch removes is_dma_capable() and an ifdef in the init/exit path
    around init/de-init of the dma_controller. Since we have the empty stubs
    in the PIO code we can call it without gcc trouble. Earlier we had an
    ifdef and the is_dma_capable() macro where gcc ignored the if (0) path
    even that the function was not around :)

    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    ---
    drivers/usb/musb/musb_core.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
    index a4434d2..b33bed5 100644
    --- a/drivers/usb/musb/musb_core.c
    +++ b/drivers/usb/musb/musb_core.c
    @@ -1764,7 +1764,7 @@ static void musb_free(struct musb *musb)
    disable_irq_wake(musb->nIrq);
    free_irq(musb->nIrq, musb);
    }
    - if (is_dma_capable() && musb->dma_controller)
    + if (musb->dma_controller)
    dma_controller_destroy(musb->dma_controller);

    musb_host_free(musb);
    @@ -1840,12 +1840,11 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)

    pm_runtime_get_sync(musb->controller);

    -#ifndef CONFIG_MUSB_PIO_ONLY
    if (use_dma && dev->dma_mask)
    musb->dma_controller = dma_controller_create(musb, musb->mregs);
    -#endif
    +
    /* ideally this would be abstracted in platform setup */
    - if (!is_dma_capable() || !musb->dma_controller)
    + if (!musb->dma_controller)
    dev->dma_mask = NULL;

    /* be sure interrupts are disabled before connecting ISR */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-07-22 20:41    [W:4.036 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site