[PATCH v4 1/1] staging: iio: ad9850.c: code cleanup

[PATCH v4 1/1] staging: iio: ad9850.c: code cleanup

[Guillaume Morin]

checkpath.pl was complaining about value_mask:
ERROR: Macros with complex values should be enclosed in parenthesis

I fixed this by simply removing it since it's not used (as well as another
macro).  Got rid of the un-necessary error_ret label as well.

Signed-off-by: Guillaume Morin <guillaume@morinfr.org>
Reported-by: Michael Welling <mwelling@ieee.org>
---
Changes since v3:
- Added Reported-by: Michael Welling <mwelling@ieee.org>

 drivers/staging/iio/frequency/ad9850.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/iio/frequency/ad9850.c b/drivers/staging/iio/frequency/ad9850.c
index af877ff..8727933 100644
--- a/drivers/staging/iio/frequency/ad9850.c
+++ b/drivers/staging/iio/frequency/ad9850.c
@@ -21,9 +21,6 @@
 
 #define DRV_NAME "ad9850"
 
-#define value_mask (u16)0xf000
-#define addr_shift 12
-
 /* Register format: 4 bits addr + 12 bits value */
 struct ad9850_config {
 	u8 control[5];
@@ -50,9 +47,6 @@ static ssize_t ad9850_set_parameter(struct device *dev,
 	mutex_lock(&st->lock);
 
 	ret = spi_sync_transfer(st->sdev, &xfer, 1);
-	if (ret)
-		goto error_ret;
-error_ret:
 	mutex_unlock(&st->lock);
 
 	return ret ? ret : len;
-- 
1.7.10.4

Re: [PATCH v4 1/1] staging: iio: ad9850.c: code cleanup

[Greg KH]

On Sat, Jun 28, 2014 at 05:54:39PM +0200, Guillaume Morin wrote:
> checkpath.pl was complaining about value_mask:
> ERROR: Macros with complex values should be enclosed in parenthesis
> 
> I fixed this by simply removing it since it's not used (as well as another
> macro).  Got rid of the un-necessary error_ret label as well.
> 
> Signed-off-by: Guillaume Morin <guillaume@morinfr.org>
> Reported-by: Michael Welling <mwelling@ieee.org>
> ---
> Changes since v3:
> - Added Reported-by: Michael Welling <mwelling@ieee.org>
> 
>  drivers/staging/iio/frequency/ad9850.c |    6 ------
>  1 file changed, 6 deletions(-)

Very good, thanks for pushing through and doing this.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH v4 1/1] staging: iio: ad9850.c: code cleanup

[Jonathan Cameron]

On 28/06/14 17:03, Greg KH wrote:
> On Sat, Jun 28, 2014 at 05:54:39PM +0200, Guillaume Morin wrote:
>> checkpath.pl was complaining about value_mask:
>> ERROR: Macros with complex values should be enclosed in parenthesis
>>
>> I fixed this by simply removing it since it's not used (as well as another
>> macro).  Got rid of the un-necessary error_ret label as well.
>>
>> Signed-off-by: Guillaume Morin <guillaume@morinfr.org>
>> Reported-by: Michael Welling <mwelling@ieee.org>

>> ---
>> Changes since v3:
>> - Added Reported-by: Michael Welling <mwelling@ieee.org>
>>
>>   drivers/staging/iio/frequency/ad9850.c |    6 ------
>>   1 file changed, 6 deletions(-)
>
> Very good, thanks for pushing through and doing this.
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
Applied to the togreg branch of iio.git

Thanks,