[media] coda: remove duplicate error messages for buffer allocations

coda_alloc_aux_buf already prints an error, no need to print duplicate
error messages all over the place.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 0073f5a5b86cdb6f5cbb237519f8efc858b30844..23041587c898ff0ca89cbe3cdeaa3bb8337594de 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -402,10 +402,8 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx,
        if (!ctx->parabuf.vaddr) {
                ret = coda_alloc_context_buf(ctx, &ctx->parabuf,
                                             CODA_PARA_BUF_SIZE, "parabuf");
-               if (ret < 0) {
-                       v4l2_err(&dev->v4l2_dev, "failed to allocate parabuf");
+               if (ret < 0)
                        return ret;
-               }
        }
 
        if (dev->devtype->product == CODA_DX6)
@@ -417,22 +415,15 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx,
                        DIV_ROUND_UP(q_data->height, 16)) * 3200 / 8 + 512;
                ret = coda_alloc_context_buf(ctx, &ctx->slicebuf, size,
                                             "slicebuf");
-               if (ret < 0) {
-                       v4l2_err(&dev->v4l2_dev,
-                                "failed to allocate %d byte slice buffer",
-                                ctx->slicebuf.size);
+               if (ret < 0)
                        goto err;
-               }
        }
 
        if (!ctx->psbuf.vaddr && dev->devtype->product == CODA_7541) {
                ret = coda_alloc_context_buf(ctx, &ctx->psbuf,
                                             CODA7_PS_BUF_SIZE, "psbuf");
-               if (ret < 0) {
-                       v4l2_err(&dev->v4l2_dev,
-                                "failed to allocate psmem buffer");
+               if (ret < 0)
                        goto err;
-               }
        }
 
        if (!ctx->workbuf.vaddr) {
@@ -442,12 +433,8 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx,
                        size += CODA9_PS_SAVE_SIZE;
                ret = coda_alloc_context_buf(ctx, &ctx->workbuf, size,
                                             "workbuf");
-               if (ret < 0) {
-                       v4l2_err(&dev->v4l2_dev,
-                                "failed to allocate %d byte context buffer",
-                                ctx->workbuf.size);
+               if (ret < 0)
                        goto err;
-               }
        }
 
        return 0;

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index ae7a35148b8468b57b003ec6a7d033c552fdbdc8..9b46088c8c7b223cc4d8ffd4f42bf33f32d5ca86 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1932,10 +1932,8 @@ static void coda_fw_callback(const struct firmware *fw, void *context)
        /* allocate auxiliary per-device code buffer for the BIT processor */
        ret = coda_alloc_aux_buf(dev, &dev->codebuf, fw->size, "codebuf",
                                 dev->debugfs_root);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to allocate code buffer\n");
+       if (ret < 0)
                goto put_pm;
-       }
 
        /* Copy the whole firmware image to the code buffer */
        memcpy(dev->codebuf.vaddr, fw->data, fw->size);
@@ -2173,20 +2171,16 @@ static int coda_probe(struct platform_device *pdev)
                ret = coda_alloc_aux_buf(dev, &dev->workbuf,
                                         dev->devtype->workbuf_size, "workbuf",
                                         dev->debugfs_root);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to allocate work buffer\n");
+               if (ret < 0)
                        goto err_v4l2_register;
-               }
        }
 
        if (dev->devtype->tempbuf_size) {
                ret = coda_alloc_aux_buf(dev, &dev->tempbuf,
                                         dev->devtype->tempbuf_size, "tempbuf",
                                         dev->debugfs_root);
-               if (ret < 0) {
-                       dev_err(&pdev->dev, "failed to allocate temp buffer\n");
+               if (ret < 0)
                        goto err_v4l2_register;
-               }
        }
 
        dev->iram.size = dev->devtype->iram_size;