Commit d9a800f7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] zoran: cleanups

From: Ronald Bultje <rbultje@ronald.bitfreak.net>

This patch changes some funky coding style (a.k.a. indent artifact) in
the function zoran_irq() to a somewhat more conservative coding style.
It was noticed by Francois Romieu.
parent b564dedd
...@@ -1453,38 +1453,23 @@ zoran_irq (int irq, ...@@ -1453,38 +1453,23 @@ zoran_irq (int irq,
0) { 0) {
/* it is finished, notify the user */ /* it is finished, notify the user */
zr->v4l_buffers.buffer[zr-> zr->v4l_buffers.buffer[zr->v4l_grab_frame].state = BUZ_STATE_DONE;
v4l_grab_frame]. zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.seq = zr->v4l_grab_seq;
state = BUZ_STATE_DONE; do_gettimeofday(&zr->v4l_buffers.buffer[zr->v4l_grab_frame].bs.timestamp);
zr->v4l_buffers.buffer[zr-> zr->v4l_grab_frame = NO_GRAB_ACTIVE;
v4l_grab_frame].
bs.seq =
zr->v4l_grab_seq;
do_gettimeofday(&zr->
v4l_buffers.
buffer[zr->
v4l_grab_frame].
bs.
timestamp);
zr->v4l_grab_frame =
NO_GRAB_ACTIVE;
zr->v4l_pend_tail++; zr->v4l_pend_tail++;
} }
} }
if (zr->v4l_grab_frame == NO_GRAB_ACTIVE) if (zr->v4l_grab_frame == NO_GRAB_ACTIVE)
wake_up_interruptible(&zr-> wake_up_interruptible(&zr->v4l_capq);
v4l_capq);
/* Check if there is another grab queued */ /* Check if there is another grab queued */
if (zr->v4l_grab_frame == NO_GRAB_ACTIVE && if (zr->v4l_grab_frame == NO_GRAB_ACTIVE &&
zr->v4l_pend_tail != zr->v4l_pend_tail != zr->v4l_pend_head) {
zr->v4l_pend_head) {
int frame = int frame = zr->v4l_pend[zr->v4l_pend_tail &
zr->v4l_pend[zr->
v4l_pend_tail &
V4L_MASK_FRAME]; V4L_MASK_FRAME];
u32 reg; u32 reg;
...@@ -1559,11 +1544,8 @@ zoran_irq (int irq, ...@@ -1559,11 +1544,8 @@ zoran_irq (int irq,
int i; int i;
strcpy(sv, sc); strcpy(sv, sc);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (zr-> if (zr->stat_com[i] & 1)
stat_com[i] & sv[i] = '1';
1)
sv[i] =
'1';
} }
sv[4] = 0; sv[4] = 0;
printk(KERN_INFO printk(KERN_INFO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment