V4L/DVB: drivers/media/video: Adjust confusing if indentation
In cx23885/cx23885-video.c, cx88/cx88-video.c, davinci/vpif_capture.c, and davinci/vpif_display.c, group the aligned code into a single if branch. In saa7134/saa7134-video.c, outdent the code following the if. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r disable braces4@ position p1,p2; statement S1,S2; @@ ( if (...) { ... } | if (...) S1@p1 S2@p2 ) @script:python@ p1 << r.p1; p2 << r.p2; @@ if (p1[0].column == p2[0].column): cocci.print_main("branch",p1) cocci.print_secs("after",p2) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
6c2d4dd139
commit
473d802473
5 changed files with 9 additions and 5 deletions
|
@ -1165,9 +1165,10 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
|
|||
i->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
strcpy(i->name, iname[INPUT(n)->type]);
|
||||
if ((CX23885_VMUX_TELEVISION == INPUT(n)->type) ||
|
||||
(CX23885_VMUX_CABLE == INPUT(n)->type))
|
||||
(CX23885_VMUX_CABLE == INPUT(n)->type)) {
|
||||
i->type = V4L2_INPUT_TYPE_TUNER;
|
||||
i->std = CX23885_NORMS;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1267,9 +1267,10 @@ int cx88_enum_input (struct cx88_core *core,struct v4l2_input *i)
|
|||
i->type = V4L2_INPUT_TYPE_CAMERA;
|
||||
strcpy(i->name,iname[INPUT(n).type]);
|
||||
if ((CX88_VMUX_TELEVISION == INPUT(n).type) ||
|
||||
(CX88_VMUX_CABLE == INPUT(n).type))
|
||||
(CX88_VMUX_CABLE == INPUT(n).type)) {
|
||||
i->type = V4L2_INPUT_TYPE_TUNER;
|
||||
i->std = CX88_NORMS;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(cx88_enum_input);
|
||||
|
|
|
@ -1030,9 +1030,10 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
|
|||
goto qbuf_exit;
|
||||
|
||||
if ((VIDEOBUF_NEEDS_INIT != buf1->state)
|
||||
&& (buf1->baddr != tbuf.m.userptr))
|
||||
&& (buf1->baddr != tbuf.m.userptr)) {
|
||||
vpif_buffer_release(&common->buffer_queue, buf1);
|
||||
buf1->baddr = tbuf.m.userptr;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -935,9 +935,10 @@ static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
|
|||
goto qbuf_exit;
|
||||
|
||||
if ((VIDEOBUF_NEEDS_INIT != buf1->state)
|
||||
&& (buf1->baddr != tbuf.m.userptr))
|
||||
&& (buf1->baddr != tbuf.m.userptr)) {
|
||||
vpif_buffer_release(&common->buffer_queue, buf1);
|
||||
buf1->baddr = tbuf.m.userptr;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -1825,7 +1825,7 @@ static int saa7134_querycap(struct file *file, void *priv,
|
|||
|
||||
if ((tuner_type == TUNER_ABSENT) || (tuner_type == UNSET))
|
||||
cap->capabilities &= ~V4L2_CAP_TUNER;
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id)
|
||||
|
|
Reference in a new issue