2010-04-30 18:12:18

by Roel Van Nyen

Subject: [PATCH] Staging: iio: Fix remaining code style issues

fix code style issues

Signed-of-by: Roel Van Nyen <[email protected]>
---
drivers/staging/iio/industrialio-core.c | 2 +-
drivers/staging/iio/ring_sw.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 1d77082..dce8dcc 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -810,7 +810,7 @@ int iio_device_register(struct iio_dev *dev_info)
ret = iio_device_register_eventset(dev_info);
if (ret) {
dev_err(dev_info->dev.parent,
- "Failed to register event set \n");
+ "Failed to register event set\n");
goto error_free_sysfs;
}
if (dev_info->modes & INDIO_RING_TRIGGERED)
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index e95b6a4..4981803 100644
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -126,8 +126,7 @@ int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
spin_lock(&ring->buf.shared_ev_pointer.lock);

ret = iio_push_or_escallate_ring_event(&ring->buf,
- IIO_EVENT_CODE_RING_100_FULL,
- timestamp);
+ IIO_EVENT_CODE_RING_100_FUL, timestamp);
spin_unlock(&ring->buf.shared_ev_pointer.lock);
if (ret)
goto error_ret;
--
1.6.3.3

2010-04-30 19:00:36

by Greg KH

Subject: Re: Staging: iio: Fix remaining code style issues

On Thu, Apr 29, 2010 at 07:27:31PM +0200, Roel Van Nyen wrote:
> fix code style issues
>
> Signed-of-by: Roel Van Nyen <[email protected]>
> Cc: Jonathan Cameron <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> --- a/drivers/staging/iio/industrialio-core.c
> +++ b/drivers/staging/iio/industrialio-core.c
> @@ -810,7 +810,7 @@ int iio_device_register(struct iio_dev *dev_info)
> ret = iio_device_register_eventset(dev_info);
> if (ret) {
> dev_err(dev_info->dev.parent,
> - "Failed to register event set \n");
> + "Failed to register event set\n");
> goto error_free_sysfs;
> }
> if (dev_info->modes & INDIO_RING_TRIGGERED)
> diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
> index e95b6a4..4981803 100644
> --- a/drivers/staging/iio/ring_sw.c
> +++ b/drivers/staging/iio/ring_sw.c
> @@ -126,8 +126,7 @@ int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
> spin_lock(&ring->buf.shared_ev_pointer.lock);
>
> ret = iio_push_or_escallate_ring_event(&ring->buf,
> - IIO_EVENT_CODE_RING_100_FULL,
> - timestamp);
> + IIO_EVENT_CODE_RING_100_FUL, timestamp);

You never tested this fix :(

It breaks the build, please be more careful next time. I've fixed it
up...

thanks,

greg k-h