summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndreas Ruprecht <rupran@einserver.de>2011-11-28 15:59:13 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-30 10:37:33 (GMT)
commit28998e005bb669b60de0e432d6f142267f5c1403 (patch)
tree263f968c6551ba93bc47104833bd0593e1a1c0ba /drivers
parentc1fcc4c9bd50d2d29bfaeb888af7de246343235d (diff)
downloadlinux-28998e005bb669b60de0e432d6f142267f5c1403.tar.xz
Staging: iio/accel: Changed return type of lis3l02dq_read_event_config() to int
The lis3l02dq_read_event_config() function returned an ssize_t up to now, which lead to a compiler warning in line 660 (initialization from incompatible pointer type). The iio_info struct is defined to accept an int-returning function as the read_event_config parameter. Also it seems odd to have the check for (ret < 0) and return ret in this case, when the return type is signed. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/iio/accel/lis3l02dq_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 5da40b33..cdc9fc5 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -535,7 +535,7 @@ static struct iio_chan_spec lis3l02dq_channels[] = {
};
-static ssize_t lis3l02dq_read_event_config(struct iio_dev *indio_dev,
+static int lis3l02dq_read_event_config(struct iio_dev *indio_dev,
u64 event_code)
{