2015-08-12 11:12:55

by Shah, Yash (Y.)

[permalink] [raw]
Subject: [PATCH] Staging: media/bcm2048: Fix line over 80 characters warning as detected by checkpatch.pl

From: Yash Shah <[email protected]>

Fix line over 80 characters warning as detected by checkpatch.pl

Signed-off-by: Yash Shah <[email protected]>
---
drivers/staging/media/bcm2048/radio-bcm2048.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 8bc68e2..d36350e 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2243,7 +2243,8 @@ static ssize_t bcm2048_fops_read(struct file *file, char __user *buf,

tmpbuf[i] = bdev->rds_info.radio_text[bdev->rd_index+i+2];
tmpbuf[i+1] = bdev->rds_info.radio_text[bdev->rd_index+i+1];
- tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i] & 0xf0) >> 4;
+ tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i]
+ & 0xf0) >> 4;
if ((bdev->rds_info.radio_text[bdev->rd_index+i] &
BCM2048_RDS_CRC_MASK) == BCM2048_RDS_CRC_UNRECOVARABLE)
tmpbuf[i+2] |= 0x80;
--
1.9.1


2015-08-12 11:19:45

by Pali Rohár

[permalink] [raw]
Subject: Re: [PATCH] Staging: media/bcm2048: Fix line over 80 characters warning as detected by checkpatch.pl

On Wednesday 12 August 2015 11:12:49 Shah, Yash (Y.) wrote:
> From: Yash Shah <[email protected]>
>
> Fix line over 80 characters warning as detected by checkpatch.pl
>
> Signed-off-by: Yash Shah <[email protected]>
> ---
> drivers/staging/media/bcm2048/radio-bcm2048.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
> index 8bc68e2..d36350e 100644
> --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
> +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
> @@ -2243,7 +2243,8 @@ static ssize_t bcm2048_fops_read(struct file *file, char __user *buf,
>
> tmpbuf[i] = bdev->rds_info.radio_text[bdev->rd_index+i+2];
> tmpbuf[i+1] = bdev->rds_info.radio_text[bdev->rd_index+i+1];
> - tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i] & 0xf0) >> 4;
> + tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i]
> + & 0xf0) >> 4;
> if ((bdev->rds_info.radio_text[bdev->rd_index+i] &
> BCM2048_RDS_CRC_MASK) == BCM2048_RDS_CRC_UNRECOVARABLE)
> tmpbuf[i+2] |= 0x80;

Hi! I think that code after this change is less readable as before.

--
Pali Rohár
[email protected]

2015-08-12 13:34:00

by Frans Klaver

[permalink] [raw]
Subject: Re: [PATCH] Staging: media/bcm2048: Fix line over 80 characters warning as detected by checkpatch.pl

On Wed, Aug 12, 2015 at 1:19 PM, Pali Rohár <[email protected]> wrote:
> On Wednesday 12 August 2015 11:12:49 Shah, Yash (Y.) wrote:
>> From: Yash Shah <[email protected]>
>>
>> Fix line over 80 characters warning as detected by checkpatch.pl
>>
>> Signed-off-by: Yash Shah <[email protected]>
>> ---
>> drivers/staging/media/bcm2048/radio-bcm2048.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
>> index 8bc68e2..d36350e 100644
>> --- a/drivers/staging/media/bcm2048/radio-bcm2048.c
>> +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
>> @@ -2243,7 +2243,8 @@ static ssize_t bcm2048_fops_read(struct file *file, char __user *buf,
>>
>> tmpbuf[i] = bdev->rds_info.radio_text[bdev->rd_index+i+2];
>> tmpbuf[i+1] = bdev->rds_info.radio_text[bdev->rd_index+i+1];
>> - tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i] & 0xf0) >> 4;
>> + tmpbuf[i+2] = (bdev->rds_info.radio_text[bdev->rd_index + i]
>> + & 0xf0) >> 4;
>> if ((bdev->rds_info.radio_text[bdev->rd_index+i] &
>> BCM2048_RDS_CRC_MASK) == BCM2048_RDS_CRC_UNRECOVARABLE)
>> tmpbuf[i+2] |= 0x80;
>
> Hi! I think that code after this change is less readable as before.

I agree. I would do something about 'bdev->rds_info.radio_text'
instead and shorten all three lines.

Frans