Skip to content

L
linux
Commit 925b6578 authored by Amarjargal Gundjalam's avatar Amarjargal Gundjalam Committed by Greg Kroah-Hartman
Browse files
Options

staging: media: bcm2048: match alignments with open parenthesis 

This patch fixes the checkpatch issue:

CHECK: Alignment should match open parenthesis
Signed-off-by: default avatarAmarjargal Gundjalam <amarjargal.gundjalam@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6fbbf260
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 158 deletions
drivers/staging/media/bcm2048/radio-bcm2048.c
View file @ 925b6578
...@@ -1040,10 +1040,10 @@ static int bcm2048_set_rds_b_block_mask(struct bcm2048_device *bdev, u16 mask) ...@@ -1040,10 +1040,10 @@ static int bcm2048_set_rds_b_block_mask(struct bcm2048_device *bdev, u16 mask)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_send_command(bdev, err = bcm2048_send_command(bdev, BCM2048_I2C_RDS_BLKB_MASK0,
BCM2048_I2C_RDS_BLKB_MASK0, lsb(mask)); lsb(mask));
err |= bcm2048_send_command(bdev, err |= bcm2048_send_command(bdev, BCM2048_I2C_RDS_BLKB_MASK1,
BCM2048_I2C_RDS_BLKB_MASK1, msb(mask)); msb(mask));
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
return err; return err;
...@@ -1056,10 +1056,8 @@ static int bcm2048_get_rds_b_block_mask(struct bcm2048_device *bdev) ...@@ -1056,10 +1056,8 @@ static int bcm2048_get_rds_b_block_mask(struct bcm2048_device *bdev)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_recv_command(bdev, err = bcm2048_recv_command(bdev, BCM2048_I2C_RDS_BLKB_MASK0, &lsb);
BCM2048_I2C_RDS_BLKB_MASK0, &lsb); err |= bcm2048_recv_command(bdev, BCM2048_I2C_RDS_BLKB_MASK1, &msb);
err |= bcm2048_recv_command(bdev,
BCM2048_I2C_RDS_BLKB_MASK1, &msb);
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
...@@ -1076,10 +1074,10 @@ static int bcm2048_set_rds_b_block_match(struct bcm2048_device *bdev, ...@@ -1076,10 +1074,10 @@ static int bcm2048_set_rds_b_block_match(struct bcm2048_device *bdev,
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_send_command(bdev, err = bcm2048_send_command(bdev, BCM2048_I2C_RDS_BLKB_MATCH0,
BCM2048_I2C_RDS_BLKB_MATCH0, lsb(match)); lsb(match));
err |= bcm2048_send_command(bdev, err |= bcm2048_send_command(bdev, BCM2048_I2C_RDS_BLKB_MATCH1,
BCM2048_I2C_RDS_BLKB_MATCH1, msb(match)); msb(match));
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
return err; return err;
...@@ -1092,10 +1090,8 @@ static int bcm2048_get_rds_b_block_match(struct bcm2048_device *bdev) ...@@ -1092,10 +1090,8 @@ static int bcm2048_get_rds_b_block_match(struct bcm2048_device *bdev)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_recv_command(bdev, err = bcm2048_recv_command(bdev, BCM2048_I2C_RDS_BLKB_MATCH0, &lsb);
BCM2048_I2C_RDS_BLKB_MATCH0, &lsb); err |= bcm2048_recv_command(bdev, BCM2048_I2C_RDS_BLKB_MATCH1, &msb);
err |= bcm2048_recv_command(bdev,
BCM2048_I2C_RDS_BLKB_MATCH1, &msb);
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
...@@ -1111,10 +1107,8 @@ static int bcm2048_set_rds_pi_mask(struct bcm2048_device *bdev, u16 mask) ...@@ -1111,10 +1107,8 @@ static int bcm2048_set_rds_pi_mask(struct bcm2048_device *bdev, u16 mask)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_send_command(bdev, err = bcm2048_send_command(bdev, BCM2048_I2C_RDS_PI_MASK0, lsb(mask));
BCM2048_I2C_RDS_PI_MASK0, lsb(mask)); err |= bcm2048_send_command(bdev, BCM2048_I2C_RDS_PI_MASK1, msb(mask));
err |= bcm2048_send_command(bdev,
BCM2048_I2C_RDS_PI_MASK1, msb(mask));
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
return err; return err;
...@@ -1127,10 +1121,8 @@ static int bcm2048_get_rds_pi_mask(struct bcm2048_device *bdev) ...@@ -1127,10 +1121,8 @@ static int bcm2048_get_rds_pi_mask(struct bcm2048_device *bdev)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_recv_command(bdev, err = bcm2048_recv_command(bdev, BCM2048_I2C_RDS_PI_MASK0, &lsb);
BCM2048_I2C_RDS_PI_MASK0, &lsb); err |= bcm2048_recv_command(bdev, BCM2048_I2C_RDS_PI_MASK1, &msb);
err |= bcm2048_recv_command(bdev,
BCM2048_I2C_RDS_PI_MASK1, &msb);
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
...@@ -1146,10 +1138,10 @@ static int bcm2048_set_rds_pi_match(struct bcm2048_device *bdev, u16 match) ...@@ -1146,10 +1138,10 @@ static int bcm2048_set_rds_pi_match(struct bcm2048_device *bdev, u16 match)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_send_command(bdev, err = bcm2048_send_command(bdev, BCM2048_I2C_RDS_PI_MATCH0,
BCM2048_I2C_RDS_PI_MATCH0, lsb(match)); lsb(match));
err |= bcm2048_send_command(bdev, err |= bcm2048_send_command(bdev, BCM2048_I2C_RDS_PI_MATCH1,
BCM2048_I2C_RDS_PI_MATCH1, msb(match)); msb(match));
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
return err; return err;
...@@ -1162,10 +1154,8 @@ static int bcm2048_get_rds_pi_match(struct bcm2048_device *bdev) ...@@ -1162,10 +1154,8 @@ static int bcm2048_get_rds_pi_match(struct bcm2048_device *bdev)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_recv_command(bdev, err = bcm2048_recv_command(bdev, BCM2048_I2C_RDS_PI_MATCH0, &lsb);
BCM2048_I2C_RDS_PI_MATCH0, &lsb); err |= bcm2048_recv_command(bdev, BCM2048_I2C_RDS_PI_MATCH1, &msb);
err |= bcm2048_recv_command(bdev,
BCM2048_I2C_RDS_PI_MATCH1, &msb);
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
...@@ -1181,10 +1171,8 @@ static int bcm2048_set_fm_rds_mask(struct bcm2048_device *bdev, u16 mask) ...@@ -1181,10 +1171,8 @@ static int bcm2048_set_fm_rds_mask(struct bcm2048_device *bdev, u16 mask)
mutex_lock(&bdev->mutex); mutex_lock(&bdev->mutex);
err = bcm2048_send_command(bdev, err = bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_MASK0, lsb(mask));
BCM2048_I2C_FM_RDS_MASK0, lsb(mask)); err |= bcm2048_send_command(bdev, BCM2048_I2C_FM_RDS_MASK1, msb(mask));
err |= bcm2048_send_command(bdev,
BCM2048_I2C_FM_RDS_MASK1, msb(mask));
mutex_unlock(&bdev->mutex); mutex_unlock(&bdev->mutex);
return err; return err;
...@@ -1607,14 +1595,14 @@ static void bcm2048_parse_rds_rt(struct bcm2048_device *bdev) ...@@ -1607,14 +1595,14 @@ static void bcm2048_parse_rds_rt(struct bcm2048_device *bdev)
} }
/* Skip erroneous blocks due to messed up A block altogether */ /* Skip erroneous blocks due to messed up A block altogether */
if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) ==
== BCM2048_RDS_BLOCK_A) { BCM2048_RDS_BLOCK_A) {
crc = bcm2048_rds_block_crc(bdev, i); crc = bcm2048_rds_block_crc(bdev, i);
if (crc == BCM2048_RDS_CRC_UNRECOVARABLE) if (crc == BCM2048_RDS_CRC_UNRECOVARABLE)
continue; continue;
/* Syncronize to a good RDS PI */ /* Syncronize to a good RDS PI */
if (((bdev->rds_info.radio_text[i+1] << 8) + if (((bdev->rds_info.radio_text[i + 1] << 8) +
bdev->rds_info.radio_text[i+2]) == bdev->rds_info.radio_text[i + 2]) ==
bdev->rds_info.rds_pi) bdev->rds_info.rds_pi)
match_b = 1; match_b = 1;
} }
...@@ -1743,14 +1731,14 @@ static void bcm2048_parse_rds_ps(struct bcm2048_device *bdev) ...@@ -1743,14 +1731,14 @@ static void bcm2048_parse_rds_ps(struct bcm2048_device *bdev)
} }
/* Skip erroneous blocks due to messed up A block altogether */ /* Skip erroneous blocks due to messed up A block altogether */
if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) if ((bdev->rds_info.radio_text[i] & BCM2048_RDS_BLOCK_MASK) ==
== BCM2048_RDS_BLOCK_A) { BCM2048_RDS_BLOCK_A) {
crc = bcm2048_rds_block_crc(bdev, i); crc = bcm2048_rds_block_crc(bdev, i);
if (crc == BCM2048_RDS_CRC_UNRECOVARABLE) if (crc == BCM2048_RDS_CRC_UNRECOVARABLE)
continue; continue;
/* Syncronize to a good RDS PI */ /* Syncronize to a good RDS PI */
if (((bdev->rds_info.radio_text[i+1] << 8) + if (((bdev->rds_info.radio_text[i + 1] << 8) +
bdev->rds_info.radio_text[i+2]) == bdev->rds_info.radio_text[i + 2]) ==
bdev->rds_info.rds_pi) bdev->rds_info.rds_pi)
match_b = 1; match_b = 1;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7