Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffcab07a authored by Manuel Stahl's avatar Manuel Stahl Committed by Greg Kroah-Hartman
Browse files

staging: iio rename ring attributes 



bps -> bytes_per_datum
ring_enable -> enable

Signed-off-by: default avatarManuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 213fd227

drivers/staging/iio/accel/adis16209_ring.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ static void adis16209_trigger_bh_to_ring(struct work_struct *work_s) 
	int i = 0;

	int i = 0;

	s16 *data;

	s16 *data;

	size_t datasize = st->indio_dev

	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);

	data = kmalloc(datasize , GFP_KERNEL);

	if (data == NULL) {

	if (data == NULL) {

drivers/staging/iio/accel/adis16240_ring.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,7 @@ static void adis16240_trigger_bh_to_ring(struct work_struct *work_s) 
	int i = 0;

	int i = 0;

	s16 *data;

	s16 *data;

	size_t datasize = st->indio_dev

	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);

	data = kmalloc(datasize , GFP_KERNEL);

	if (data == NULL) {

	if (data == NULL) {

drivers/staging/iio/accel/lis3l02dq_ring.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -169,7 +169,7 @@ ssize_t lis3l02dq_read_accel_from_ring(struct device *dev, 
	if (ret < 0)

	if (ret < 0)

		goto error_ret;

		goto error_ret;

	if (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);

			       GFP_KERNEL);

		if (data == NULL)

		if (data == NULL)

			return -ENOMEM;

			return -ENOMEM;

drivers/staging/iio/accel/sca3000_ring.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -100,7 +100,7 @@ static int sca3000_ring_get_length(struct iio_ring_buffer *r) 
}

}





/* only valid if resolution is kept at 11bits */

/* 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;

	return 6;

}

}
@@ -111,7 +111,7 @@ static void sca3000_ring_release(struct device *dev) 
}

}





static IIO_RING_ENABLE_ATTR;

static IIO_RING_ENABLE_ATTR;

static IIO_RING_BPS_ATTR;

static IIO_RING_BYTES_PER_DATUM_ATTR;

static IIO_RING_LENGTH_ATTR;

static IIO_RING_LENGTH_ATTR;





/**

/**
@@ -218,8 +218,8 @@ static struct attribute_group sca3000_scan_el_group = { 
 */

 */

static struct attribute *sca3000_ring_attributes[] = {

static struct attribute *sca3000_ring_attributes[] = {

	&dev_attr_length.attr,

	&dev_attr_length.attr,

	&dev_attr_bps.attr,

	&dev_attr_bytes_per_datum.attr,

	&dev_attr_ring_enable.attr,

	&dev_attr_enable.attr,

	NULL,

	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.rip_lots = &sca3000_rip_hw_rb;

	indio_dev->ring->access.get_length = &sca3000_ring_get_length;

	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;

	return 0;

}

}

drivers/staging/iio/adc/max1363_ring.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -92,14 +92,14 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev) 
	max1363_set_scan_mode(st);

	max1363_set_scan_mode(st);





	numvals = hweight_long(st->current_mode->modemask);

	numvals = hweight_long(st->current_mode->modemask);

	if (indio_dev->ring->access.set_bpd) {

	if (indio_dev->ring->access.set_bytes_per_datum) {

		if (st->chip_info->bits != 8)

		if (st->chip_info->bits != 8)

			d_size = numvals*2 + sizeof(s64);

			d_size = numvals*2 + sizeof(s64);

		else

		else

			d_size = numvals + sizeof(s64);

			d_size = numvals + sizeof(s64);

		if (d_size % 8)

		if (d_size % 8)

			d_size += 8 - (d_size % 8);

			d_size += 8 - (d_size % 8);

		indio_dev->ring->access.set_bpd(indio_dev->ring, d_size);

		indio_dev->ring->access.set_bytes_per_datum(indio_dev->ring, d_size);

	}

	}





	return 0;

	return 0;