[PATCH] staging: iio: accel: remove unnecessary syntax

[PATCH] staging: iio: accel: remove unnecessary syntax

[Chris Ruffin]

The else clause in the conditional of lis3l02dq_data_rdy_trig_poll()
does not make consistent use of braces with the rest of the
conditional.  Fix this coding style problem by removing the
unnecessary conditional altogether.

Signed-off-by: Chris Ruffin <cmruffin@gmail.com>
---
 drivers/staging/iio/accel/lis3l02dq_ring.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 1d934ee..9efc77b 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -34,8 +34,9 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
 	if (st->trigger_on) {
 		iio_trigger_poll(st->trig);
 		return IRQ_HANDLED;
-	} else
-		return IRQ_WAKE_THREAD;
+	}
+
+	return IRQ_WAKE_THREAD;
 }
 
 static const u8 read_all_tx_array[] = {
-- 
1.7.10.4

Re: [PATCH] staging: iio: accel: remove unnecessary syntax

[Hartmut Knaack]

Chris Ruffin schrieb, Am 15.09.2014 01:38:
> The else clause in the conditional of lis3l02dq_data_rdy_trig_poll()
> does not make consistent use of braces with the rest of the
> conditional.  Fix this coding style problem by removing the
> unnecessary conditional altogether.
> 
> Signed-off-by: Chris Ruffin <cmruffin@gmail.com>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
> ---
>  drivers/staging/iio/accel/lis3l02dq_ring.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
> index 1d934ee..9efc77b 100644
> --- a/drivers/staging/iio/accel/lis3l02dq_ring.c
> +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
> @@ -34,8 +34,9 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
>  	if (st->trigger_on) {
>  		iio_trigger_poll(st->trig);
>  		return IRQ_HANDLED;
> -	} else
> -		return IRQ_WAKE_THREAD;
> +	}
> +
> +	return IRQ_WAKE_THREAD;
>  }
>  
>  static const u8 read_all_tx_array[] = {
> 

Re: [PATCH] staging: iio: accel: remove unnecessary syntax

[Jonathan Cameron]

On 15/09/14 22:37, Hartmut Knaack wrote:
> Chris Ruffin schrieb, Am 15.09.2014 01:38:
>> The else clause in the conditional of lis3l02dq_data_rdy_trig_poll()
>> does not make consistent use of braces with the rest of the
>> conditional.  Fix this coding style problem by removing the
>> unnecessary conditional altogether.
>>
>> Signed-off-by: Chris Ruffin <cmruffin@gmail.com>
> Acked-by: Hartmut Knaack <knaack.h@gmx.de>
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play.

Thanks,

Jonathan
>> ---
>>  drivers/staging/iio/accel/lis3l02dq_ring.c |    5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
>> index 1d934ee..9efc77b 100644
>> --- a/drivers/staging/iio/accel/lis3l02dq_ring.c
>> +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
>> @@ -34,8 +34,9 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
>>  	if (st->trigger_on) {
>>  		iio_trigger_poll(st->trig);
>>  		return IRQ_HANDLED;
>> -	} else
>> -		return IRQ_WAKE_THREAD;
>> +	}
>> +
>> +	return IRQ_WAKE_THREAD;
>>  }
>>  
>>  static const u8 read_all_tx_array[] = {
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>