Skip to content

Commit

Permalink
Staging: cx25821: Fix long lines in cx25821-video-upstream-ch2.c
Browse files Browse the repository at this point in the history
Fix long lines in cx25821-video-upstream-ch2.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 12, 2011
1 parent 6d71b8f commit 0b22597
Showing 1 changed file with 9 additions and 17 deletions.
26 changes: 9 additions & 17 deletions drivers/staging/cx25821/cx25821-video-upstream-ch2.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");
MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
MODULE_LICENSE("GPL");

static int _intr_msk =
FLD_VID_SRC_RISC1 | FLD_VID_SRC_UF | FLD_VID_SRC_SYNC | FLD_VID_SRC_OPC_ERR;
static int _intr_msk = FLD_VID_SRC_RISC1 | FLD_VID_SRC_UF | FLD_VID_SRC_SYNC |
FLD_VID_SRC_OPC_ERR;

static __le32 *cx25821_update_riscprogram_ch2(struct cx25821_dev *dev,
__le32 *rp, unsigned int offset,
Expand Down Expand Up @@ -166,13 +166,9 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,
if (UNSET != top_offset) {
fifo_enable = (frame == 0) ? FIFO_ENABLE : FIFO_DISABLE;
rp = cx25821_risc_field_upstream_ch2(dev, rp,
dev->
_data_buf_phys_addr_ch2
+ databuf_offset,
top_offset, 0, bpl,
odd_num_lines,
fifo_enable,
ODD_FIELD);
dev->_data_buf_phys_addr_ch2 + databuf_offset,
top_offset, 0, bpl, odd_num_lines, fifo_enable,
ODD_FIELD);
}

fifo_enable = FIFO_DISABLE;
Expand Down Expand Up @@ -571,14 +567,10 @@ int cx25821_video_upstream_irq_ch2(struct cx25821_dev *dev, int chan_num,
odd_risc_prog_size;

rp = cx25821_update_riscprogram_ch2(dev,
dev->
_dma_virt_start_addr_ch2,
TOP_OFFSET,
line_size_in_bytes,
0x0,
singlefield_lines,
FIFO_DISABLE,
ODD_FIELD);
dev->_dma_virt_start_addr_ch2,
TOP_OFFSET, line_size_in_bytes,
0x0, singlefield_lines,
FIFO_DISABLE, ODD_FIELD);

/* Jump to Even Risc program of 1st Frame */
*(rp++) = cpu_to_le32(RISC_JUMP);
Expand Down

0 comments on commit 0b22597

Please sign in to comment.