[PATCH 1/5] iio: staging: fix device.txt documentation

[PATCH 1/5] iio: staging: fix device.txt documentation

[Peter Meerwald]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
 drivers/staging/iio/Documentation/device.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/Documentation/device.txt b/drivers/staging/iio/Documentation/device.txt
index ea08d62..8be32e5 100644
--- a/drivers/staging/iio/Documentation/device.txt
+++ b/drivers/staging/iio/Documentation/device.txt
@@ -56,7 +56,7 @@ Then fill in the following:
 
 - indio_dev->modes:
 	Specify whether direct access and / or ring buffer access is supported.
-- indio_dev->ring:
+- indio_dev->buffer:
 	An optional associated buffer.
 - indio_dev->pollfunc:
 	Poll function related elements. This controls what occurs when a trigger
@@ -67,7 +67,7 @@ Then fill in the following:
 - indio_dev->num_channels:
 	How many channels are there?
 
-Once these are set up, a call to iio_device_register(indio_dev),
+Once these are set up, a call to iio_device_register(indio_dev)
 will register the device with the iio core.
 
 Worth noting here is that, if a ring buffer is to be used, it can be
-- 
1.8.3.2

[PATCH 2/5] iio: fix typo, Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350

[Peter Meerwald]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
 Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
index d89aded..1254457 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
+++ b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
@@ -18,4 +18,4 @@ Description:
 		adjust the reference frequency accordingly.
 		The value written has no effect until out_altvoltageY_frequency
 		is updated. Consider to use out_altvoltageY_powerdown to power
-		down the PLL and it's RFOut buffers during REFin changes.
+		down the PLL and its RFOut buffers during REFin changes.
-- 
1.8.3.2

[PATCH 3/5] iio: staging: fix typo in ade758_ring.c

[Peter Meerwald]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
 drivers/staging/iio/meter/ade7758_ring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index b29e2d5..7d5db71 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -54,7 +54,7 @@ out:
 	return ret;
 }
 
-/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
+/* Whilst this makes a lot of calls to iio_sw_ring functions - it is too device
  * specific to be rolled into the core.
  */
 static irqreturn_t ade7758_trigger_handler(int irq, void *p)
-- 
1.8.3.2

[PATCH 4/5] iio staging: fix lis3l02dq, read error handling

[Peter Meerwald]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
 drivers/staging/iio/accel/lis3l02dq_core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 1bfe5d8..8ed75a9 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -257,6 +257,8 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
 			ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
 		}
 		mutex_unlock(&indio_dev->mlock);
+		if (ret < 0)
+			goto error_ret;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
 		*val = 0;
-- 
1.8.3.2

[PATCH 5/5] iio: fix semicolon in io_core_trigger.h

[Peter Meerwald]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
---
 drivers/iio/iio_core_trigger.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/iio_core_trigger.h b/drivers/iio/iio_core_trigger.h
index 6f7c56f..1fdb1e4 100644
--- a/drivers/iio/iio_core_trigger.h
+++ b/drivers/iio/iio_core_trigger.h
@@ -30,7 +30,7 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev);
 static int iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
 {
 	return 0;
-};
+}
 
 /**
  * iio_device_unregister_trigger_consumer() - reverse the registration process
@@ -38,9 +38,6 @@ static int iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
  **/
 static void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev)
 {
-};
+}
 
 #endif /* CONFIG_TRIGGER_CONSUMER */
-
-
-
-- 
1.8.3.2

Re: [PATCH 4/5] iio staging: fix lis3l02dq, read error handling

[Jonathan Cameron]

On 07/07/2013 09:24 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the fixes-togreg branch of iio.git

Peter, just as an aside please separate out actual code
fixes like this one into separate series from the comment typo fixes.
Whilst both are worthwhile, comment typos can always wait for the
next merge window, but code fixes want to go in asap and perhaps
back into stable.
> ---
>  drivers/staging/iio/accel/lis3l02dq_core.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
> index 1bfe5d8..8ed75a9 100644
> --- a/drivers/staging/iio/accel/lis3l02dq_core.c
> +++ b/drivers/staging/iio/accel/lis3l02dq_core.c
> @@ -257,6 +257,8 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
>  			ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
>  		}
>  		mutex_unlock(&indio_dev->mlock);
> +		if (ret < 0)
> +			goto error_ret;
>  		return IIO_VAL_INT;
>  	case IIO_CHAN_INFO_SCALE:
>  		*val = 0;
> 

Re: [PATCH 1/5] iio: staging: fix device.txt documentation

[Jonathan Cameron]

On 07/07/2013 09:24 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
applied to the togreg branch of iio.git.
Thanks.
> ---
>  drivers/staging/iio/Documentation/device.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/Documentation/device.txt b/drivers/staging/iio/Documentation/device.txt
> index ea08d62..8be32e5 100644
> --- a/drivers/staging/iio/Documentation/device.txt
> +++ b/drivers/staging/iio/Documentation/device.txt
> @@ -56,7 +56,7 @@ Then fill in the following:
>  
>  - indio_dev->modes:
>  	Specify whether direct access and / or ring buffer access is supported.
> -- indio_dev->ring:
> +- indio_dev->buffer:
>  	An optional associated buffer.
>  - indio_dev->pollfunc:
>  	Poll function related elements. This controls what occurs when a trigger
> @@ -67,7 +67,7 @@ Then fill in the following:
>  - indio_dev->num_channels:
>  	How many channels are there?
>  
> -Once these are set up, a call to iio_device_register(indio_dev),
> +Once these are set up, a call to iio_device_register(indio_dev)
>  will register the device with the iio core.
>  
>  Worth noting here is that, if a ring buffer is to be used, it can be
> 

Re: [PATCH 2/5] iio: fix typo, Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350

[Jonathan Cameron]

On 07/07/2013 09:24 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git
> ---
>  Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
> index d89aded..1254457 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
> +++ b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
> @@ -18,4 +18,4 @@ Description:
>  		adjust the reference frequency accordingly.
>  		The value written has no effect until out_altvoltageY_frequency
>  		is updated. Consider to use out_altvoltageY_powerdown to power
> -		down the PLL and it's RFOut buffers during REFin changes.
> +		down the PLL and its RFOut buffers during REFin changes.
> 

Re: [PATCH 3/5] iio: staging: fix typo in ade758_ring.c

[Jonathan Cameron]

On 07/07/2013 09:24 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
applied to the togreg branch of iio.git
> ---
>  drivers/staging/iio/meter/ade7758_ring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
> index b29e2d5..7d5db71 100644
> --- a/drivers/staging/iio/meter/ade7758_ring.c
> +++ b/drivers/staging/iio/meter/ade7758_ring.c
> @@ -54,7 +54,7 @@ out:
>  	return ret;
>  }
>  
> -/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device
> +/* Whilst this makes a lot of calls to iio_sw_ring functions - it is too device
>   * specific to be rolled into the core.
>   */
>  static irqreturn_t ade7758_trigger_handler(int irq, void *p)
> 

Re: [PATCH 5/5] iio: fix semicolon in io_core_trigger.h

[Jonathan Cameron]

On 07/07/2013 09:24 PM, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git

Thanks,
> ---
>  drivers/iio/iio_core_trigger.h | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/iio/iio_core_trigger.h b/drivers/iio/iio_core_trigger.h
> index 6f7c56f..1fdb1e4 100644
> --- a/drivers/iio/iio_core_trigger.h
> +++ b/drivers/iio/iio_core_trigger.h
> @@ -30,7 +30,7 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev);
>  static int iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
>  {
>  	return 0;
> -};
> +}
>  
>  /**
>   * iio_device_unregister_trigger_consumer() - reverse the registration process
> @@ -38,9 +38,6 @@ static int iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
>   **/
>  static void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev)
>  {
> -};
> +}
>  
>  #endif /* CONFIG_TRIGGER_CONSUMER */
> -
> -
> -
>