staging: iio_simple_dummy: fix return types

The functions iio_dummy_remove(), iio_simple_dummy_events_unregister() and
iio_dummy_evgen_release_irq() were changed to return void instead of int.

Signed-off-by: Vladimirs Ambrosovs <rodriguez.twister@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/iio_dummy_evgen.c b/drivers/staging/iio/iio_dummy_evgen.c
index 0c9c86d7b5095b96a6248aff0d045bd3f3206008..c54d5b5443a637ac10c40678f7aa54fdf8349700 100644 (file)
--- a/drivers/staging/iio/iio_dummy_evgen.c
+++ b/drivers/staging/iio/iio_dummy_evgen.c
@@ -128,13 +128,11 @@ EXPORT_SYMBOL_GPL(iio_dummy_evgen_get_irq);
  *
  * Used by client driver instances to give the irqs back when they disconnect
  */
-int iio_dummy_evgen_release_irq(int irq)
+void iio_dummy_evgen_release_irq(int irq)
 {
        mutex_lock(&iio_evgen->lock);
        iio_evgen->inuse[irq - iio_evgen->base] = false;
        mutex_unlock(&iio_evgen->lock);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(iio_dummy_evgen_release_irq);
 

diff --git a/drivers/staging/iio/iio_dummy_evgen.h b/drivers/staging/iio/iio_dummy_evgen.h
index 2ac293ab7c8fbdbe6f0393bbd3a9784d82ea0ca7..d044b946e74a71d2a5a9f76d6f2cde0de40749ed 100644 (file)
--- a/drivers/staging/iio/iio_dummy_evgen.h
+++ b/drivers/staging/iio/iio_dummy_evgen.h
@@ -8,6 +8,6 @@ struct iio_dummy_regs {
 
 struct iio_dummy_regs *iio_dummy_evgen_get_regs(int irq);
 int iio_dummy_evgen_get_irq(void);
-int iio_dummy_evgen_release_irq(int irq);
+void iio_dummy_evgen_release_irq(int irq);
 
 #endif /* _IIO_DUMMY_EVGEN_H_ */

diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c
index d0a99637007c40cdc51d9846d98f4792d6acd66b..dc9482c7569cbcb2a032c9f8a16387ed79c92a5b 100644 (file)
--- a/drivers/staging/iio/iio_simple_dummy.c
+++ b/drivers/staging/iio/iio_simple_dummy.c
@@ -665,9 +665,8 @@ error_ret:
  *
  * Parameters follow those of iio_dummy_probe for buses.
  */
-static int iio_dummy_remove(int index)
+static void iio_dummy_remove(int index)
 {
-       int ret;
        /*
         * Get a pointer to the device instance iio_dev structure
         * from the bus subsystem. E.g.
@@ -685,15 +684,10 @@ static int iio_dummy_remove(int index)
        /* Buffered capture related cleanup */
        iio_simple_dummy_unconfigure_buffer(indio_dev);
 
-       ret = iio_simple_dummy_events_unregister(indio_dev);
-       if (ret)
-               goto error_ret;
+       iio_simple_dummy_events_unregister(indio_dev);
 
        /* Free all structures */
        iio_device_free(indio_dev);
-
-error_ret:
-       return ret;
 }
 
 /**

diff --git a/drivers/staging/iio/iio_simple_dummy.h b/drivers/staging/iio/iio_simple_dummy.h
index d86ccb76eb6dfb1011aebb5dadf12c6b59a5f732..e877a99540abced251ef937f70a4abe7cab89f4a 100644 (file)
--- a/drivers/staging/iio/iio_simple_dummy.h
+++ b/drivers/staging/iio/iio_simple_dummy.h
@@ -79,7 +79,7 @@ int iio_simple_dummy_write_event_value(struct iio_dev *indio_dev,
                                       int val2);
 
 int iio_simple_dummy_events_register(struct iio_dev *indio_dev);
-int iio_simple_dummy_events_unregister(struct iio_dev *indio_dev);
+void iio_simple_dummy_events_unregister(struct iio_dev *indio_dev);
 
 #else /* Stubs for when events are disabled at compile time */
 
@@ -89,11 +89,9 @@ iio_simple_dummy_events_register(struct iio_dev *indio_dev)
        return 0;
 };
 
-static inline int
+static inline void
 iio_simple_dummy_events_unregister(struct iio_dev *indio_dev)
-{
-       return 0;
-};
+{ };
 
 #endif /* CONFIG_IIO_SIMPLE_DUMMY_EVENTS*/
 

diff --git a/drivers/staging/iio/iio_simple_dummy_events.c b/drivers/staging/iio/iio_simple_dummy_events.c
index c32ef78d8e5f38952cf44f0c77228c2804a658ba..ecc563cb6cb9ad236601b5b0e70fcf4c7d24ab3f 100644 (file)
--- a/drivers/staging/iio/iio_simple_dummy_events.c
+++ b/drivers/staging/iio/iio_simple_dummy_events.c
@@ -257,13 +257,11 @@ error_ret:
  * iio_simple_dummy_events_unregister() - tidy up interrupt handling on remove
  * @indio_dev: device instance data
  */
-int iio_simple_dummy_events_unregister(struct iio_dev *indio_dev)
+void iio_simple_dummy_events_unregister(struct iio_dev *indio_dev)
 {
        struct iio_dummy_state *st = iio_priv(indio_dev);
 
        free_irq(st->event_irq, indio_dev);
        /* Not part of normal driver */
        iio_dummy_evgen_release_irq(st->event_irq);
-
-       return 0;
 }