Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba53b81 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 650b939e

drivers/media/platform/coda/coda-bit.c

+4 −17
Original line number Diff line number Diff line
@@ -402,11 +402,9 @@ 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)

		return 0;
@@ -417,23 +415,16 @@ 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) {

		size = dev->devtype->workbuf_size;
@@ -442,13 +433,9 @@ 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;

drivers/media/platform/coda/coda-common.c

+3 −9
Original line number Diff line number Diff line
@@ -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,21 +2171,17 @@ 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;

	dev->iram.vaddr = gen_pool_dma_alloc(dev->iram_pool, dev->iram.size,