Modified: trunk/drivers/staging/iio/accel/lis3l02dq_ring.c (8800 => 8801)
--- trunk/drivers/staging/iio/accel/lis3l02dq_ring.c 2010-05-23 04:12:49 UTC (rev 8800)
+++ trunk/drivers/staging/iio/accel/lis3l02dq_ring.c 2010-05-23 04:13:03 UTC (rev 8801)
@@ -207,7 +207,7 @@
* @rx_array: (dma capable) recieve array, must be at least
* 4*number of channels
**/
-int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array)
+static int lis3l02dq_read_all(struct lis3l02dq_state *st, u8 *rx_array)
{
struct spi_transfer *xfers;
struct spi_message msg;
@@ -591,7 +591,6 @@
iio_ring_buffer_unregister(ring);
}
-
int lis3l02dq_set_ring_length(struct iio_dev *indio_dev, int length)
{
/* Set sensible defaults for the ring buffer */
Modified: trunk/drivers/staging/iio/accel/sca3000_ring.c (8800 => 8801)
--- trunk/drivers/staging/iio/accel/sca3000_ring.c 2010-05-23 04:12:49 UTC (rev 8800)
+++ trunk/drivers/staging/iio/accel/sca3000_ring.c 2010-05-23 04:13:03 UTC (rev 8801)
@@ -186,9 +186,9 @@
return ret ? ret : len;
}
-static IIO_SCAN_EL_C(accel_x, 0, 0, 0, 0);
-static IIO_SCAN_EL_C(accel_y, 1, 0, 0, 0);
-static IIO_SCAN_EL_C(accel_z, 2, 0, 0, 0);
+static IIO_SCAN_EL_C(accel_x, 0, 0, 0, NULL);
+static IIO_SCAN_EL_C(accel_y, 1, 0, 0, NULL);
+static IIO_SCAN_EL_C(accel_z, 2, 0, 0, NULL);
static IIO_CONST_ATTR(accel_precision_available, "8 11");
static IIO_DEVICE_ATTR(accel_precision,
S_IRUGO | S_IWUSR,
@@ -244,7 +244,7 @@
ring = kzalloc(sizeof *ring, GFP_KERNEL);
if (!ring)
- return 0;
+ return NULL;
ring->private = indio_dev;
buf = &ring->buf;
iio_ring_buffer_init(buf, indio_dev);
