lkml.org 
[lkml]   [2011]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/25] Staging: comedi: fix printk issue in pcl818.c
    Date
    This is a patch to the pcl818.c file that fixes up a printk
    warning found by the checkpatch.pl tool.
    Removed an unnecessary printks.

    Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
    ---
    drivers/staging/comedi/drivers/pcl818.c | 16 ++++------------
    1 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
    index bad7ee4..7344a53 100644
    --- a/drivers/staging/comedi/drivers/pcl818.c
    +++ b/drivers/staging/comedi/drivers/pcl818.c
    @@ -1841,34 +1841,26 @@ no_rtc:
    if (dma < 1)
    goto no_dma; /* DMA disabled */
    if (((1 << dma) & this_board->DMAbits) == 0) {
    - printk(", DMA is out of allowed range, FAIL!\n");
    + printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");
    return -EINVAL; /* Bad DMA */
    }
    ret = request_dma(dma, "pcl818");
    - if (ret) {
    - printk(", unable to allocate DMA %u, FAIL!\n", dma);
    + if (ret)
    return -EBUSY; /* DMA isn't free */
    - }
    devpriv->dma = dma;
    - printk(", dma=%u", dma);
    pages = 2; /* we need 16KB */
    devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
    - if (!devpriv->dmabuf[0]) {
    - printk(", unable to allocate DMA buffer, FAIL!\n");
    + if (!devpriv->dmabuf[0])
    /* maybe experiment with try_to_free_pages() will help .... */
    return -EBUSY; /* no buffer :-( */
    - }
    devpriv->dmapages[0] = pages;
    devpriv->hwdmaptr[0] = virt_to_bus((void *)devpriv->dmabuf[0]);
    devpriv->hwdmasize[0] = (1 << pages) * PAGE_SIZE;
    /* printk("%d %d %ld, ",devpriv->dmapages[0],devpriv->hwdmasize[0],PAGE_SIZE); */
    if (devpriv->dma_rtc == 0) { /* we must do duble buff :-( */
    devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
    - if (!devpriv->dmabuf[1]) {
    - printk
    - (", unable to allocate DMA buffer, FAIL!\n");
    + if (!devpriv->dmabuf[1])
    return -EBUSY;
    - }
    devpriv->dmapages[1] = pages;
    devpriv->hwdmaptr[1] =
    virt_to_bus((void *)devpriv->dmabuf[1]);
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2011-11-18 14:05    [W:0.041 / U:0.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site