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

Commit 44f270de authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging: iio: Remove unused bit_count from struct iio_scan_el 



The job this was intended to do (never implemented) is now done
by explicit definition of _type attributes in all drivers

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

drivers/staging/iio/accel/adis16209_ring.c

+8 −13
Original line number Diff line number Diff line
@@ -17,27 +17,22 @@ 
#include "../trigger.h"

#include "adis16209.h"



static IIO_SCAN_EL_C(in_supply, ADIS16209_SCAN_SUPPLY, IIO_UNSIGNED(14),

static IIO_SCAN_EL_C(in_supply, ADIS16209_SCAN_SUPPLY,

		     ADIS16209_SUPPLY_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 14, 16)

static IIO_SCAN_EL_C(accel_x, ADIS16209_SCAN_ACC_X, IIO_SIGNED(14),

		     ADIS16209_XACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_y, ADIS16209_SCAN_ACC_Y, IIO_SIGNED(14),

		     ADIS16209_YACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_x, ADIS16209_SCAN_ACC_X, ADIS16209_XACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_y, ADIS16209_SCAN_ACC_Y, ADIS16209_YACCL_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16);

static IIO_SCAN_EL_C(in0, ADIS16209_SCAN_AUX_ADC, IIO_UNSIGNED(12),

		     ADIS16209_AUX_ADC, NULL);

static IIO_SCAN_EL_C(in0, ADIS16209_SCAN_AUX_ADC, ADIS16209_AUX_ADC, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);

static IIO_SCAN_EL_C(temp, ADIS16209_SCAN_TEMP, IIO_UNSIGNED(12),

		     ADIS16209_TEMP_OUT, NULL);

static IIO_SCAN_EL_C(temp, ADIS16209_SCAN_TEMP, ADIS16209_TEMP_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16);

static IIO_SCAN_EL_C(incli_x, ADIS16209_SCAN_INCLI_X, IIO_SIGNED(14),

static IIO_SCAN_EL_C(incli_x, ADIS16209_SCAN_INCLI_X,

		     ADIS16209_XINCL_OUT, NULL);

static IIO_SCAN_EL_C(incli_y, ADIS16209_SCAN_INCLI_Y, IIO_SIGNED(14),

static IIO_SCAN_EL_C(incli_y, ADIS16209_SCAN_INCLI_Y,

		     ADIS16209_YINCL_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(incli, s, 14, 16);

static IIO_SCAN_EL_C(rot, ADIS16209_SCAN_ROT, IIO_SIGNED(14),

		     ADIS16209_ROT_OUT, NULL);

static IIO_SCAN_EL_C(rot, ADIS16209_SCAN_ROT, ADIS16209_ROT_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(rot, s, 14, 16);

static IIO_SCAN_EL_TIMESTAMP(8);

static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);

drivers/staging/iio/accel/adis16240_ring.c

+6 −12
Original line number Diff line number Diff line
@@ -17,23 +17,17 @@ 
#include "../trigger.h"

#include "adis16240.h"



static IIO_SCAN_EL_C(in_supply, ADIS16240_SCAN_SUPPLY, IIO_UNSIGNED(10),

static IIO_SCAN_EL_C(in_supply, ADIS16240_SCAN_SUPPLY,

		ADIS16240_SUPPLY_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 10, 16);

static IIO_SCAN_EL_C(accel_x, ADIS16240_SCAN_ACC_X, IIO_SIGNED(10),

		ADIS16240_XACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_y, ADIS16240_SCAN_ACC_Y, IIO_SIGNED(10),

		ADIS16240_YACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_z, ADIS16240_SCAN_ACC_Z, IIO_SIGNED(10),

		ADIS16240_ZACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_x, ADIS16240_SCAN_ACC_X, ADIS16240_XACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_y, ADIS16240_SCAN_ACC_Y, ADIS16240_YACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_z, ADIS16240_SCAN_ACC_Z, ADIS16240_ZACCL_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 10, 16);

static IIO_SCAN_EL_C(in0, ADIS16240_SCAN_AUX_ADC, IIO_UNSIGNED(10),

		ADIS16240_AUX_ADC, NULL);

static IIO_SCAN_EL_C(in0, ADIS16240_SCAN_AUX_ADC, ADIS16240_AUX_ADC, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 10, 16);

static IIO_SCAN_EL_C(temp, ADIS16240_SCAN_TEMP, IIO_UNSIGNED(10),

		ADIS16240_TEMP_OUT, NULL);

static IIO_SCAN_EL_C(temp, ADIS16240_SCAN_TEMP, ADIS16240_TEMP_OUT, NULL);

static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 10, 16);



static IIO_SCAN_EL_TIMESTAMP(6);

static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);

drivers/staging/iio/accel/lis3l02dq_ring.c

+3 −3
Original line number Diff line number Diff line
@@ -75,13 +75,13 @@ static int lis3l02dq_scan_el_set_state(struct iio_scan_el *scan_el, 
	return ret;



}

static IIO_SCAN_EL_C(accel_x, 0, IIO_SIGNED(16),

static IIO_SCAN_EL_C(accel_x, 0,

		     LIS3L02DQ_REG_OUT_X_L_ADDR,

		     &lis3l02dq_scan_el_set_state);

static IIO_SCAN_EL_C(accel_y, 1, IIO_SIGNED(16),

static IIO_SCAN_EL_C(accel_y, 1,

		     LIS3L02DQ_REG_OUT_Y_L_ADDR,

		     &lis3l02dq_scan_el_set_state);

static IIO_SCAN_EL_C(accel_z, 2, IIO_SIGNED(16),

static IIO_SCAN_EL_C(accel_z, 2,

		     LIS3L02DQ_REG_OUT_Z_L_ADDR,

		     &lis3l02dq_scan_el_set_state);

static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 12, 16);

drivers/staging/iio/accel/sca3000_ring.c

+3 −3
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ static ssize_t sca3000_store_ring_bpse(struct device *dev, 
	return ret ? ret : len;

}



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_SCAN_EL_C(accel_x, 0, 0, NULL);

static IIO_SCAN_EL_C(accel_y, 1, 0, NULL);

static IIO_SCAN_EL_C(accel_z, 2, 0, NULL);

static IIO_CONST_ATTR(accel_type_available, "s8/8 s11/16");

static IIO_DEVICE_ATTR(accel_type,

		       S_IRUGO | S_IWUSR,

drivers/staging/iio/adc/max1363_core.c

+3 −4
Original line number Diff line number Diff line
@@ -43,10 +43,9 @@ 
 * us a lot of scan element listings */



#define MAX1363_SCAN_EL(number)				\

	IIO_SCAN_EL_C(in##number, number, IIO_UNSIGNED(16), 0, NULL);

	IIO_SCAN_EL_C(in##number, number, 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);

	IIO_SCAN_NAMED_EL_C(in##p##m##in##n, in##p-in##n, number, 0, NULL);



static MAX1363_SCAN_EL(0);

static MAX1363_SCAN_EL(1);