diff options
| author | Laurent Pinchart | 2013-12-03 21:26:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-12-11 06:50:22 -0200 |
| commit | 499226fb196fef838fa38700b96448a2ec41b704 (patch) | |
| tree | 830be0b76fa0231ed1780774ea8e80ce2acb7df3 | |
| parent | 4cd89e91bb8dbefe54743df6a5c4437812c96e3a (diff) | |
[media] v4l: omap4iss: Don't split log strings on multiple lines
Non-split strings help grepping for messages.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/staging/media/omap4iss/iss.c | 6 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_csi2.c | 13 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_resizer.c | 5 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.c | 4 |
4 files changed, 10 insertions, 18 deletions
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index 3ac986e6289c..53dcb5488a7e 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -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; } diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c index 9ced9ce5c201..c3a5fcaa02b0 100644 --- a/drivers/staging/media/omap4iss/iss_csi2.c +++ b/drivers/staging/media/omap4iss/iss_csi2.c @@ -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 & diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index cb5df52e45a6..e5a3a8cfbf2c 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -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 & diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 5a92bac70bd6..3e543d92c8d8 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -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; } |