diff options
| author |   Jonathan Cameron <jic23@cam.ac.uk> | 2010-06-26 12:54:14 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-08 12:25:27 -0700 |
| commit | c40ab87494522201a8478305204c3db8e051af73 (patch) | |
| tree | 3e6dc1e3937fff499592de994e2a5d734f9d80a9 /drivers/staging/iio | |
| parent | staging:iio:max1363 use device_id instead of searching on name again (diff) | |
| download | linux-dev-c40ab87494522201a8478305204c3db8e051af73.tar.xz linux-dev-c40ab87494522201a8478305204c3db8e051af73.zip | |
staging:iio:max1363 trivial code and comment cleanups.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/adc/max1363_core.c | 7 | ||||
| -rw-r--r-- | drivers/staging/iio/adc/max1363_ring.c | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 9b60b275de84..31d856375faa 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c @@ -23,16 +23,15 @@ */ #include <linux/interrupt.h> -#include <linux/gpio.h> #include <linux/workqueue.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/sysfs.h> #include <linux/list.h> #include <linux/i2c.h> -#include <linux/rtc.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> +#include <linux/err.h> #include "../iio.h" #include "../sysfs.h" @@ -48,7 +47,7 @@ IIO_SCAN_EL_C(in##number, number, IIO_UNSIGNED(16), 0, NULL); #define MAX1363_SCAN_EL_D(p, n, number) \ IIO_SCAN_NAMED_EL_C(in##p##m##in##n, in##p-in##n, \ - number, IIO_SIGNED(16), 0 , NULL); + number, IIO_SIGNED(16), 0, NULL); static MAX1363_SCAN_EL(0); static MAX1363_SCAN_EL(1); @@ -167,7 +166,7 @@ static int max1363_write_basic_config(struct i2c_client *client, unsigned char d2) { int ret; - u8 *tx_buf = kmalloc(2 , GFP_KERNEL); + u8 *tx_buf = kmalloc(2, GFP_KERNEL); if (!tx_buf) return -ENOMEM; diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index a49b3d7aae9f..b30d680bafa6 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c @@ -68,7 +68,7 @@ error_ret: } /** - * max1363_ring_preenable() setup the parameters of the ring before enabling + * max1363_ring_preenable() - setup the parameters of the ring before enabling * * The complex nature of the setting of the nuber of bytes per datum is due * to this driver currently ensuring that the timestamp is stored at an 8 @@ -106,7 +106,7 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev) } /** - * max1363_ring_postenable() typical ring post enable + * max1363_ring_postenable() - typical ring post enable * * Only not moved into the core for the hardware ring buffer cases * that are more sophisticated. @@ -120,7 +120,7 @@ static int max1363_ring_postenable(struct iio_dev *indio_dev) } /** - * max1363_ring_predisable() runs just prior to ring buffer being disabled + * max1363_ring_predisable() - runs just prior to ring buffer being disabled * * Typical predisable function which ensures that no trigger events can * occur before we disable the ring buffer (and hence would have no idea @@ -136,7 +136,7 @@ static int max1363_ring_predisable(struct iio_dev *indio_dev) } /** - * max1363_poll_func_th() th of trigger launched polling to ring buffer + * max1363_poll_func_th() - th of trigger launched polling to ring buffer * * As sampling only occurs on i2c comms occuring, leave timestamping until * then. Some triggers will generate their own time stamp. Currently @@ -151,7 +151,7 @@ static void max1363_poll_func_th(struct iio_dev *indio_dev) return; } /** - * max1363_poll_bh_to_ring() bh of trigger launched polling to ring buffer + * max1363_poll_bh_to_ring() - bh of trigger launched polling to ring buffer * @work_s: the work struct through which this was scheduled * * Currently there is no option in this driver to disable the saving of |