mirror of https://gitee.com/openkylin/linux.git
[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>
This commit is contained in:
parent
4cd89e91bb
commit
499226fb19
|
@ -1073,9 +1073,9 @@ iss_register_subdev_group(struct iss_device *iss,
|
||||||
|
|
||||||
adapter = i2c_get_adapter(board_info->i2c_adapter_id);
|
adapter = i2c_get_adapter(board_info->i2c_adapter_id);
|
||||||
if (adapter == NULL) {
|
if (adapter == NULL) {
|
||||||
dev_err(iss->dev, "%s: Unable to get I2C adapter %d for "
|
dev_err(iss->dev,
|
||||||
"device %s\n", __func__,
|
"%s: Unable to get I2C adapter %d for device %s\n",
|
||||||
board_info->i2c_adapter_id,
|
__func__, board_info->i2c_adapter_id,
|
||||||
board_info->board_info->type);
|
board_info->board_info->type);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -754,8 +754,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
|
||||||
CSI2_COMPLEXIO_IRQSTATUS);
|
CSI2_COMPLEXIO_IRQSTATUS);
|
||||||
writel(cpxio1_irqstatus,
|
writel(cpxio1_irqstatus,
|
||||||
csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);
|
csi2->regs1 + CSI2_COMPLEXIO_IRQSTATUS);
|
||||||
dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ "
|
dev_dbg(iss->dev, "CSI2: ComplexIO Error IRQ %x\n",
|
||||||
"%x\n", cpxio1_irqstatus);
|
cpxio1_irqstatus);
|
||||||
pipe->error = true;
|
pipe->error = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -764,13 +764,8 @@ void omap4iss_csi2_isr(struct iss_csi2_device *csi2)
|
||||||
CSI2_IRQ_ECC_NO_CORRECTION |
|
CSI2_IRQ_ECC_NO_CORRECTION |
|
||||||
CSI2_IRQ_COMPLEXIO_ERR |
|
CSI2_IRQ_COMPLEXIO_ERR |
|
||||||
CSI2_IRQ_FIFO_OVF)) {
|
CSI2_IRQ_FIFO_OVF)) {
|
||||||
dev_dbg(iss->dev, "CSI2 Err:"
|
dev_dbg(iss->dev,
|
||||||
" OCP:%d,"
|
"CSI2 Err: OCP:%d SHORT:%d ECC:%d CPXIO:%d OVF:%d\n",
|
||||||
" Short_pack:%d,"
|
|
||||||
" ECC:%d,"
|
|
||||||
" CPXIO:%d,"
|
|
||||||
" FIFO_OVF:%d,"
|
|
||||||
"\n",
|
|
||||||
(csi2_irqstatus &
|
(csi2_irqstatus &
|
||||||
CSI2_IRQ_OCP_ERR) ? 1 : 0,
|
CSI2_IRQ_OCP_ERR) ? 1 : 0,
|
||||||
(csi2_irqstatus &
|
(csi2_irqstatus &
|
||||||
|
|
|
@ -321,10 +321,7 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events)
|
||||||
|
|
||||||
if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK |
|
if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK |
|
||||||
ISP5_IRQ_RSZ_FIFO_OVF)) {
|
ISP5_IRQ_RSZ_FIFO_OVF)) {
|
||||||
dev_dbg(iss->dev, "RSZ Err:"
|
dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n",
|
||||||
" FIFO_IN_BLK:%d,"
|
|
||||||
" FIFO_OVF:%d,"
|
|
||||||
"\n",
|
|
||||||
(events &
|
(events &
|
||||||
ISP5_IRQ_RSZ_FIFO_IN_BLK) ? 1 : 0,
|
ISP5_IRQ_RSZ_FIFO_IN_BLK) ? 1 : 0,
|
||||||
(events &
|
(events &
|
||||||
|
|
|
@ -324,8 +324,8 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb)
|
||||||
|
|
||||||
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
|
addr = vb2_dma_contig_plane_dma_addr(vb, 0);
|
||||||
if (!IS_ALIGNED(addr, 32)) {
|
if (!IS_ALIGNED(addr, 32)) {
|
||||||
dev_dbg(video->iss->dev, "Buffer address must be "
|
dev_dbg(video->iss->dev,
|
||||||
"aligned to 32 bytes boundary.\n");
|
"Buffer address must be aligned to 32 bytes boundary.\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue