lkml.org 
[lkml]   [2011]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/36] Staging: cx25821: cx25821-video-upsstream-ch2.c: Move operators
    Date
    Move operators in complex expressions to the end of the lines to
    preserve consistency.

    Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
    ---
    .../staging/cx25821/cx25821-video-upstream-ch2.c | 16 +++++++---------
    1 files changed, 7 insertions(+), 9 deletions(-)

    diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
    index 63cc26c..42f7ba5 100644
    --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
    +++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
    @@ -65,9 +65,8 @@ static __le32 *cx25821_update_riscprogram_ch2(struct cx25821_dev *dev,
    *(rp++) = cpu_to_le32(dev->_data_buf_phys_addr_ch2 + offset);
    *(rp++) = cpu_to_le32(0); /* bits 63-32 */

    - if ((lines <= NTSC_FIELD_HEIGHT)
    - || (line < (NTSC_FIELD_HEIGHT - 1))
    - || !(dev->_isNTSC_ch2)) {
    + if ((lines <= NTSC_FIELD_HEIGHT) ||
    + (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC_ch2)) {
    offset += dist_betwn_starts;
    }
    }
    @@ -103,9 +102,8 @@ static __le32 *cx25821_risc_field_upstream_ch2(struct cx25821_dev *dev,
    *(rp++) = cpu_to_le32(databuf_phys_addr + offset);
    *(rp++) = cpu_to_le32(0); /* bits 63-32 */

    - if ((lines <= NTSC_FIELD_HEIGHT)
    - || (line < (NTSC_FIELD_HEIGHT - 1))
    - || !(dev->_isNTSC_ch2)) {
    + if ((lines <= NTSC_FIELD_HEIGHT) ||
    + (line < (NTSC_FIELD_HEIGHT - 1)) || !(dev->_isNTSC_ch2)) {
    offset += dist_betwn_starts;
    }

    @@ -413,9 +411,9 @@ int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)
    vfs_read_retval =
    vfs_read(myfile, mybuf, line_size, &pos);

    - if (vfs_read_retval > 0
    - && vfs_read_retval == line_size
    - && dev->_data_buf_virt_addr_ch2 != NULL) {
    + if (vfs_read_retval > 0 &&
    + vfs_read_retval == line_size &&
    + dev->_data_buf_virt_addr_ch2 != NULL) {
    memcpy((void *)(dev->
    _data_buf_virt_addr_ch2
    + offset / 4), mybuf,
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2011-10-22 07:51    [W:0.022 / U:0.624 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site