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

Commit 2c737e9c authored by Hugues Fruchet's avatar Hugues Fruchet Committed by Mauro Carvalho Chehab
Browse files

media: stm32-dcmi: improve error trace points 



Fix some missing "\n".
Trace error returned by subdev streamon/streamoff.
Remove extra "0x" unneeded with %pad formatter.

Signed-off-by: default avatarHugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ffb1bdc2

drivers/media/platform/stm32/stm32-dcmi.c

+9 −7
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void dcmi_dma_callback(void *param) 
		/* Restart a new DMA transfer with next buffer */

		if (dcmi->state == RUNNING) {

			if (list_empty(&dcmi->buffers)) {

				dev_err(dcmi->dev, "%s: No more buffer queued, cannot capture buffer",

				dev_err(dcmi->dev, "%s: No more buffer queued, cannot capture buffer\n",

					__func__);

				dcmi->errors_count++;

				dcmi->active = NULL;
@@ -249,7 +249,7 @@ static void dcmi_dma_callback(void *param) 
			list_del_init(&dcmi->active->list);



			if (dcmi_start_capture(dcmi)) {

				dev_err(dcmi->dev, "%s: Cannot restart capture on DMA complete",

				dev_err(dcmi->dev, "%s: Cannot restart capture on DMA complete\n",

					__func__);



				spin_unlock(&dcmi->irqlock);
@@ -478,7 +478,7 @@ static int dcmi_buf_prepare(struct vb2_buffer *vb) 


		vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->size);



		dev_dbg(dcmi->dev, "buffer[%d] phy=0x%pad size=%zu\n",

		dev_dbg(dcmi->dev, "buffer[%d] phy=%pad size=%zu\n",

			vb->index, &buf->paddr, buf->size);

	}
@@ -524,7 +524,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) 


	ret = clk_enable(dcmi->mclk);

	if (ret) {

		dev_err(dcmi->dev, "%s: Failed to start streaming, cannot enable clock",

		dev_err(dcmi->dev, "%s: Failed to start streaming, cannot enable clock\n",

			__func__);

		goto err_release_buffers;

	}
@@ -600,7 +600,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) 


	ret = dcmi_start_capture(dcmi);

	if (ret) {

		dev_err(dcmi->dev, "%s: Start streaming failed, cannot start capture",

		dev_err(dcmi->dev, "%s: Start streaming failed, cannot start capture\n",

			__func__);



		spin_unlock_irq(&dcmi->irqlock);
@@ -651,7 +651,8 @@ static void dcmi_stop_streaming(struct vb2_queue *vq) 
	/* Disable stream on the sub device */

	ret = v4l2_subdev_call(dcmi->entity.subdev, video, s_stream, 0);

	if (ret && ret != -ENOIOCTLCMD)

		dev_err(dcmi->dev, "stream off failed in subdev\n");

		dev_err(dcmi->dev, "%s: Failed to stop streaming, subdev streamoff error (%d)\n",

			__func__, ret);



	dcmi->state = STOPPING;
@@ -667,7 +668,8 @@ static void dcmi_stop_streaming(struct vb2_queue *vq) 
	reg_clear(dcmi->regs, DCMI_CR, CR_ENABLE);



	if (!timeout) {

		dev_err(dcmi->dev, "Timeout during stop streaming\n");

		dev_err(dcmi->dev, "%s: Timeout during stop streaming\n",

			__func__);

		dcmi->state = STOPPED;

	}