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

Commit 499226fb authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: omap4iss: Don't split log strings on multiple lines 



Non-split strings help grepping for messages.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 4cd89e91

drivers/staging/media/omap4iss/iss.c

+3 −3
Original line number Diff line number Diff line
@@ -1073,9 +1073,9 @@ iss_register_subdev_group(struct iss_device *iss, 


		adapter = i2c_get_adapter(board_info->i2c_adapter_id);

		if (adapter == NULL) {

			dev_err(iss->dev, "%s: Unable to get I2C adapter %d for "

				"device %s\n", __func__,

				board_info->i2c_adapter_id,

			dev_err(iss->dev,

				"%s: Unable to get I2C adapter %d for device %s\n",

				__func__, board_info->i2c_adapter_id,

				board_info->board_info->type);

			continue;

		}

drivers/staging/media/omap4iss/iss_csi2.c

+4 −9
Original line number Diff line number Diff line
@@ -754,8 +754,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2) 
					 CSI2_COMPLEXIO_IRQSTATUS);

		writel(cpxio1_irqstatus,

			csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);

		dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ "

			"%x\n", cpxio1_irqstatus);

		dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ %x\n",

			cpxio1_irqstatus);

		pipe->error = true;

	}
@@ -764,13 +764,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2) 
			      CSI2_IRQ_ECC_NO_CORRECTION |

			      CSI2_IRQ_COMPLEXIO_ERR |

			      CSI2_IRQ_FIFO_OVF)) {

		dev_dbg(iss->dev, "CSI2 Err:"

			" OCP:%d,"

			" Short_pack:%d,"

			" ECC:%d,"

			" CPXIO:%d,"

			" FIFO_OVF:%d,"

			"\n",

		dev_dbg(iss->dev,

			"CSI2 Err: OCP:%d SHORT:%d ECC:%d CPXIO:%d OVF:%d\n",

			(csi2_irqstatus &

			 CSI2_IRQ_OCP_ERR) ? 1 : 0,

			(csi2_irqstatus &

drivers/staging/media/omap4iss/iss_resizer.c

+1 −4
Original line number Diff line number Diff line
@@ -321,10 +321,7 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events) 


	if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK |

		      ISP5_IRQ_RSZ_FIFO_OVF)) {

		dev_dbg(iss->dev, "RSZ Err:"

			" FIFO_IN_BLK:%d,"

			" FIFO_OVF:%d,"

			"\n",

		dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",

			(events &

			 ISP5_IRQ_RSZ_FIFO_IN_BLK) ? 1 : 0,

			(events &

drivers/staging/media/omap4iss/iss_video.c

+2 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb) 


	addr = vb2_dma_contig_plane_dma_addr(vb, 0);

	if (!IS_ALIGNED(addr, 32)) {

		dev_dbg(video->iss->dev, "Buffer address must be "

			"aligned to 32 bytes boundary.\n");

		dev_dbg(video->iss->dev,

			"Buffer address must be aligned to 32 bytes boundary.\n");

		return -EINVAL;

	}