diff options
| author | Manuel Stahl <manuel.stahl@iis.fraunhofer.de> | 2010-08-31 11:32:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 11:42:01 -0700 |
| commit | ffcab07a7479e10eddda6c4c47f69834e2971716 (patch) | |
| tree | 36908052bf249575cfd6e24e7ee1fdbe783a8699 /drivers/staging/iio/accel | |
| parent | 213fd2270450f7b5f98803e58bc25063c249e032 (diff) | |
| download | linux-stable-ffcab07a7479e10eddda6c4c47f69834e2971716.tar.gz linux-stable-ffcab07a7479e10eddda6c4c47f69834e2971716.tar.bz2 linux-stable-ffcab07a7479e10eddda6c4c47f69834e2971716.zip | |
staging: iio rename ring attributes
bps -> bytes_per_datum
ring_enable -> enable
Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel')
| -rw-r--r-- | drivers/staging/iio/accel/adis16209_ring.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/adis16240_ring.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_ring.c | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/accel/sca3000_ring.c | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 25fde659d098..d40b95f19232 100644 --- a/drivers/staging/iio/accel/adis16209_ring.c +++ b/drivers/staging/iio/accel/adis16209_ring.c @@ -119,7 +119,7 @@ static void adis16209_trigger_bh_to_ring(struct work_struct *work_s) int i = 0; s16 *data; size_t datasize = st->indio_dev - ->ring->access.get_bpd(st->indio_dev->ring); + ->ring->access.get_bytes_per_datum(st->indio_dev->ring); data = kmalloc(datasize , GFP_KERNEL); if (data == NULL) { diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index cd69a2e2bb9a..462d4520ffc3 100644 --- a/drivers/staging/iio/accel/adis16240_ring.c +++ b/drivers/staging/iio/accel/adis16240_ring.c @@ -111,7 +111,7 @@ static void adis16240_trigger_bh_to_ring(struct work_struct *work_s) int i = 0; s16 *data; size_t datasize = st->indio_dev - ->ring->access.get_bpd(st->indio_dev->ring); + ->ring->access.get_bytes_per_datum(st->indio_dev->ring); data = kmalloc(datasize , GFP_KERNEL); if (data == NULL) { diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index a960a8ff3c40..4c1b36a76c45 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c @@ -169,7 +169,7 @@ ssize_t lis3l02dq_read_accel_from_ring(struct device *dev, if (ret < 0) goto error_ret; if (ret) { - data = kmalloc(dev_info->ring->access.get_bpd(dev_info->ring), + data = kmalloc(dev_info->ring->access.get_bytes_per_datum(dev_info->ring), GFP_KERNEL); if (data == NULL) return -ENOMEM; diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index 8e8c068d401b..eff5b9a2de3a 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c @@ -100,7 +100,7 @@ static int sca3000_ring_get_length(struct iio_ring_buffer *r) } /* only valid if resolution is kept at 11bits */ -static int sca3000_ring_get_bpd(struct iio_ring_buffer *r) +static int sca3000_ring_get_bytes_per_datum(struct iio_ring_buffer *r) { return 6; } @@ -111,7 +111,7 @@ static void sca3000_ring_release(struct device *dev) } static IIO_RING_ENABLE_ATTR; -static IIO_RING_BPS_ATTR; +static IIO_RING_BYTES_PER_DATUM_ATTR; static IIO_RING_LENGTH_ATTR; /** @@ -218,8 +218,8 @@ static struct attribute_group sca3000_scan_el_group = { */ static struct attribute *sca3000_ring_attributes[] = { &dev_attr_length.attr, - &dev_attr_bps.attr, - &dev_attr_ring_enable.attr, + &dev_attr_bytes_per_datum.attr, + &dev_attr_enable.attr, NULL, }; @@ -272,7 +272,7 @@ int sca3000_configure_ring(struct iio_dev *indio_dev) indio_dev->ring->access.rip_lots = &sca3000_rip_hw_rb; indio_dev->ring->access.get_length = &sca3000_ring_get_length; - indio_dev->ring->access.get_bpd = &sca3000_ring_get_bpd; + indio_dev->ring->access.get_bytes_per_datum = &sca3000_ring_get_bytes_per_datum; return 0; } |