Commit 6d71b8f2 authored by Leonid V. Fedorenchik's avatar Leonid V. Fedorenchik Committed by Greg Kroah-Hartman

Staging: cx25821: Fix wrong line endings in cx25821-video-upstream-ch2.c

Change obscure line endings to less obscure ones. Rationale: improve
readability.
Signed-off-by: default avatarLeonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc9518fe
...@@ -179,17 +179,14 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev, ...@@ -179,17 +179,14 @@ int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,
/* Even field */ /* Even field */
rp = cx25821_risc_field_upstream_ch2(dev, rp, rp = cx25821_risc_field_upstream_ch2(dev, rp,
dev-> dev->_data_buf_phys_addr_ch2 + databuf_offset,
_data_buf_phys_addr_ch2 + bottom_offset, 0x200, bpl, singlefield_lines,
databuf_offset, fifo_enable, EVEN_FIELD);
bottom_offset, 0x200, bpl,
singlefield_lines,
fifo_enable, EVEN_FIELD);
if (frame == 0) { if (frame == 0) {
risc_flag = RISC_CNT_RESET; risc_flag = RISC_CNT_RESET;
risc_phys_jump_addr = risc_phys_jump_addr = dev->_dma_phys_start_addr_ch2 +
dev->_dma_phys_start_addr_ch2 + risc_program_size; risc_program_size;
} else { } else {
risc_flag = RISC_CNT_INC; risc_flag = RISC_CNT_INC;
risc_phys_jump_addr = dev->_dma_phys_start_addr_ch2; risc_phys_jump_addr = dev->_dma_phys_start_addr_ch2;
...@@ -511,9 +508,8 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev, ...@@ -511,9 +508,8 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,
return ret; return ret;
/* Creating RISC programs */ /* Creating RISC programs */
ret = ret = cx25821_risc_buffer_upstream_ch2(dev, dev->pci, 0, bpl,
cx25821_risc_buffer_upstream_ch2(dev, dev->pci, 0, bpl, dev->_lines_count_ch2);
dev->_lines_count_ch2);
if (ret < 0) { if (ret < 0) {
pr_info("Failed creating Video Upstream Risc programs!\n"); pr_info("Failed creating Video Upstream Risc programs!\n");
goto error; goto error;
...@@ -806,8 +802,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, ...@@ -806,8 +802,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
} }
} }
retval = retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,
cx25821_sram_channel_setup_upstream(dev, sram_ch,
dev->_line_size_ch2, 0); dev->_line_size_ch2, 0);
/* setup fifo + format */ /* setup fifo + format */
...@@ -817,8 +812,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, ...@@ -817,8 +812,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
dev->upstream_databuf_size_ch2 = data_frame_size * 2; dev->upstream_databuf_size_ch2 = data_frame_size * 2;
/* Allocating buffers and prepare RISC program */ /* Allocating buffers and prepare RISC program */
retval = retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
dev->_line_size_ch2); dev->_line_size_ch2);
if (retval < 0) { if (retval < 0) {
pr_err("%s: Failed to set up Video upstream buffers!\n", pr_err("%s: Failed to set up Video upstream buffers!\n",
......
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