lkml.org 
[lkml]   [2014]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 12/14] dma: edma: Prefix debug prints where the text were identical in prep callbacks
    Date
    prep_slave_sg and prep_dma_cyclic callbacks have mostly same failure cases
    with the same texts printed in case we hit them. It helps when debugging if
    we know exactly which callback generated the errors.
    At the same time change the debug level for descriptor allocation failure
    from dbg to err since all other error cases are dev_err and this failure is
    similarly fatal as the other ones.

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    ---
    drivers/dma/edma.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
    index e8de2e84a60a..7feb6231276e 100644
    --- a/drivers/dma/edma.c
    +++ b/drivers/dma/edma.c
    @@ -434,14 +434,14 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
    }

    if (dev_width == DMA_SLAVE_BUSWIDTH_UNDEFINED) {
    - dev_err(dev, "Undefined slave buswidth\n");
    + dev_err(dev, "%s: Undefined slave buswidth\n", __func__);
    return NULL;
    }

    edesc = kzalloc(sizeof(*edesc) + sg_len *
    sizeof(edesc->pset[0]), GFP_ATOMIC);
    if (!edesc) {
    - dev_dbg(dev, "Failed to allocate a descriptor\n");
    + dev_err(dev, "%s: Failed to allocate a descriptor\n", __func__);
    return NULL;
    }

    @@ -457,7 +457,8 @@ static struct dma_async_tx_descriptor *edma_prep_slave_sg(
    EDMA_SLOT_ANY);
    if (echan->slot[i] < 0) {
    kfree(edesc);
    - dev_err(dev, "Failed to allocate slot\n");
    + dev_err(dev, "%s: Failed to allocate slot\n",
    + __func__);
    return NULL;
    }
    }
    @@ -526,7 +527,7 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
    }

    if (dev_width == DMA_SLAVE_BUSWIDTH_UNDEFINED) {
    - dev_err(dev, "Undefined slave buswidth\n");
    + dev_err(dev, "%s: Undefined slave buswidth\n", __func__);
    return NULL;
    }

    @@ -551,7 +552,7 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
    edesc = kzalloc(sizeof(*edesc) + nslots *
    sizeof(edesc->pset[0]), GFP_ATOMIC);
    if (!edesc) {
    - dev_dbg(dev, "Failed to allocate a descriptor\n");
    + dev_err(dev, "%s: Failed to allocate a descriptor\n", __func__);
    return NULL;
    }

    @@ -569,7 +570,8 @@ static struct dma_async_tx_descriptor *edma_prep_dma_cyclic(
    EDMA_SLOT_ANY);
    if (echan->slot[i] < 0) {
    kfree(edesc);
    - dev_err(dev, "Failed to allocate slot\n");
    + dev_err(dev, "%s: Failed to allocate slot\n",
    + __func__);
    return NULL;
    }
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-01 15:41    [W:4.118 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site