Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1607223 > unrolled thread

[PATCH] staging: iio: accel: remove unneeded braces around single statements

Started byMark Stenglein <mark@stengle.in>
First post2017-03-23 09:10 +0100
Last post2017-03-25 18:10 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] staging: iio: accel: remove unneeded braces around single statements Mark Stenglein <mark@stengle.in> - 2017-03-23 09:10 +0100
    Re: [PATCH] staging: iio: accel: remove unneeded braces around single  statements Jonathan Cameron <jic23@kernel.org> - 2017-03-25 18:10 +0100

#1607223 — [PATCH] staging: iio: accel: remove unneeded braces around single statements

FromMark Stenglein <mark@stengle.in>
Date2017-03-23 09:10 +0100
Subject[PATCH] staging: iio: accel: remove unneeded braces around single statements
Message-ID<to5YJ-7Ts-1@gated-at.bofh.it>
Fixes three checkpatch warnings due to braces used when single
statements are sufficient.

Signed-off-by: Mark Stenglein <mark@stengle.in>
---
 drivers/staging/iio/accel/adis16209.c | 3 +--
 drivers/staging/iio/accel/adis16240.c | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c
index 52fa2e0511be..8485c024e3f5 100644
--- a/drivers/staging/iio/accel/adis16209.c
+++ b/drivers/staging/iio/accel/adis16209.c
@@ -255,9 +255,8 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
 		}
 		addr = adis16209_addresses[chan->scan_index][0];
 		ret = adis_read_reg_16(st, addr, &val16);
-		if (ret) {
+		if (ret)
 			return ret;
-		}
 		val16 &= (1 << bits) - 1;
 		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
 		*val = val16;
diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
index 6e3c95c9c3f6..109cd94b5ac3 100644
--- a/drivers/staging/iio/accel/adis16240.c
+++ b/drivers/staging/iio/accel/adis16240.c
@@ -290,9 +290,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
 		bits = 10;
 		addr = adis16240_addresses[chan->scan_index][0];
 		ret = adis_read_reg_16(st, addr, &val16);
-		if (ret) {
+		if (ret)
 			return ret;
-		}
 		val16 &= (1 << bits) - 1;
 		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
 		*val = val16;
@@ -301,9 +300,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
 		bits = 10;
 		addr = adis16240_addresses[chan->scan_index][1];
 		ret = adis_read_reg_16(st, addr, &val16);
-		if (ret) {
+		if (ret)
 			return ret;
-		}
 		val16 &= (1 << bits) - 1;
 		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
 		*val = val16;
-- 
2.12.1

[toc] | [next] | [standalone]


#1609189 — Re: [PATCH] staging: iio: accel: remove unneeded braces around single statements

FromJonathan Cameron <jic23@kernel.org>
Date2017-03-25 18:10 +0100
SubjectRe: [PATCH] staging: iio: accel: remove unneeded braces around single statements
Message-ID<toXmp-3Tu-5@gated-at.bofh.it>
In reply to#1607223
On 23/03/17 06:18, Mark Stenglein wrote:
> Fixes three checkpatch warnings due to braces used when single
> statements are sufficient.
> 
> Signed-off-by: Mark Stenglein <mark@stengle.in>
Applied to the togreg branch of iio.git - initially pushed
out as testing for the autobuilders to play with it.

Thanks,

Jonathan
> ---
>  drivers/staging/iio/accel/adis16209.c | 3 +--
>  drivers/staging/iio/accel/adis16240.c | 6 ++----
>  2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/iio/accel/adis16209.c b/drivers/staging/iio/accel/adis16209.c
> index 52fa2e0511be..8485c024e3f5 100644
> --- a/drivers/staging/iio/accel/adis16209.c
> +++ b/drivers/staging/iio/accel/adis16209.c
> @@ -255,9 +255,8 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
>  		}
>  		addr = adis16209_addresses[chan->scan_index][0];
>  		ret = adis_read_reg_16(st, addr, &val16);
> -		if (ret) {
> +		if (ret)
>  			return ret;
> -		}
>  		val16 &= (1 << bits) - 1;
>  		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
>  		*val = val16;
> diff --git a/drivers/staging/iio/accel/adis16240.c b/drivers/staging/iio/accel/adis16240.c
> index 6e3c95c9c3f6..109cd94b5ac3 100644
> --- a/drivers/staging/iio/accel/adis16240.c
> +++ b/drivers/staging/iio/accel/adis16240.c
> @@ -290,9 +290,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
>  		bits = 10;
>  		addr = adis16240_addresses[chan->scan_index][0];
>  		ret = adis_read_reg_16(st, addr, &val16);
> -		if (ret) {
> +		if (ret)
>  			return ret;
> -		}
>  		val16 &= (1 << bits) - 1;
>  		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
>  		*val = val16;
> @@ -301,9 +300,8 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
>  		bits = 10;
>  		addr = adis16240_addresses[chan->scan_index][1];
>  		ret = adis_read_reg_16(st, addr, &val16);
> -		if (ret) {
> +		if (ret)
>  			return ret;
> -		}
>  		val16 &= (1 << bits) - 1;
>  		val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
>  		*val = val16;
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web