diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-01-16 07:48:00 -0500 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-01-26 05:07:47 -0500 |
commit | ca6907df6b5d86d848eac706f28c7a89126f3875 (patch) | |
tree | 34ca605cb553eafec1de106fba8420222b86f0a9 | |
parent | bdb20bdb8c1ea55c9a2f744cc5b2c7f66148a41b (diff) |
staging:iio:adis16400: Remove unused default_scan_mask
The chip_info struct for contains a defaul_scan_mask field. But it is never
actually used in the code, so remove it from the chip_info struct.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/staging/iio/imu/adis16400.h | 1 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16400_core.c | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h index 7a105e966464..3efafcbb886e 100644 --- a/drivers/staging/iio/imu/adis16400.h +++ b/drivers/staging/iio/imu/adis16400.h | |||
@@ -145,7 +145,6 @@ struct adis16400_chip_info { | |||
145 | unsigned int accel_scale_micro; | 145 | unsigned int accel_scale_micro; |
146 | int temp_scale_nano; | 146 | int temp_scale_nano; |
147 | int temp_offset; | 147 | int temp_offset; |
148 | unsigned long default_scan_mask; | ||
149 | int (*set_freq)(struct iio_dev *indio_dev, unsigned int freq); | 148 | int (*set_freq)(struct iio_dev *indio_dev, unsigned int freq); |
150 | int (*get_freq)(struct iio_dev *indio_dev); | 149 | int (*get_freq)(struct iio_dev *indio_dev); |
151 | }; | 150 | }; |
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c index 7114de94f412..24fca1033fb3 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/staging/iio/imu/adis16400_core.c | |||
@@ -1116,12 +1116,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1116 | .accel_scale_micro = 5884, | 1116 | .accel_scale_micro = 5884, |
1117 | .temp_scale_nano = 140000000, /* 0.14 C */ | 1117 | .temp_scale_nano = 140000000, /* 0.14 C */ |
1118 | .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */ | 1118 | .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */ |
1119 | .default_scan_mask = (1 << ADIS16400_SCAN_SUPPLY) | | ||
1120 | (1 << ADIS16400_SCAN_GYRO_X) | (1 << ADIS16400_SCAN_ACC_X) | | ||
1121 | (1 << ADIS16400_SCAN_ACC_Y) | (1 << ADIS16400_SCAN_ACC_Z) | | ||
1122 | (1 << ADIS16400_SCAN_TEMP) | (1 << ADIS16400_SCAN_ADC_0) | | ||
1123 | (1 << ADIS16300_SCAN_INCLI_X) | (1 << ADIS16300_SCAN_INCLI_Y) | | ||
1124 | (1 << 14), | ||
1125 | .set_freq = adis16400_set_freq, | 1119 | .set_freq = adis16400_set_freq, |
1126 | .get_freq = adis16400_get_freq, | 1120 | .get_freq = adis16400_get_freq, |
1127 | }, | 1121 | }, |
@@ -1133,10 +1127,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1133 | .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */ | 1127 | .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */ |
1134 | .temp_scale_nano = 67850000, /* 0.06785 C */ | 1128 | .temp_scale_nano = 67850000, /* 0.06785 C */ |
1135 | .temp_offset = 25000000 / 67850, /* 25 C = 0x00 */ | 1129 | .temp_offset = 25000000 / 67850, /* 25 C = 0x00 */ |
1136 | .default_scan_mask = (1 << ADIS16400_SCAN_GYRO_X) | | ||
1137 | (1 << ADIS16400_SCAN_GYRO_Y) | (1 << ADIS16400_SCAN_GYRO_Z) | | ||
1138 | (1 << ADIS16400_SCAN_ACC_X) | (1 << ADIS16400_SCAN_ACC_Y) | | ||
1139 | (1 << ADIS16400_SCAN_ACC_Z), | ||
1140 | .set_freq = adis16334_set_freq, | 1130 | .set_freq = adis16334_set_freq, |
1141 | .get_freq = adis16334_get_freq, | 1131 | .get_freq = adis16334_get_freq, |
1142 | }, | 1132 | }, |
@@ -1147,7 +1137,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1147 | .accel_scale_micro = IIO_G_TO_M_S_2(2522), /* 0.002522 g */ | 1137 | .accel_scale_micro = IIO_G_TO_M_S_2(2522), /* 0.002522 g */ |
1148 | .temp_scale_nano = 145300000, /* 0.1453 C */ | 1138 | .temp_scale_nano = 145300000, /* 0.1453 C */ |
1149 | .temp_offset = 25000000 / 145300, /* 25 C = 0x00 */ | 1139 | .temp_offset = 25000000 / 145300, /* 25 C = 0x00 */ |
1150 | .default_scan_mask = 0x7FF, | ||
1151 | .flags = ADIS16400_NO_BURST | ADIS16400_HAS_SLOW_MODE, | 1140 | .flags = ADIS16400_NO_BURST | ADIS16400_HAS_SLOW_MODE, |
1152 | .set_freq = adis16400_set_freq, | 1141 | .set_freq = adis16400_set_freq, |
1153 | .get_freq = adis16400_get_freq, | 1142 | .get_freq = adis16400_get_freq, |
@@ -1160,7 +1149,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1160 | .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */ | 1149 | .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */ |
1161 | .temp_scale_nano = 136000000, /* 0.136 C */ | 1150 | .temp_scale_nano = 136000000, /* 0.136 C */ |
1162 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ | 1151 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ |
1163 | .default_scan_mask = 0x7FF, | ||
1164 | .set_freq = adis16400_set_freq, | 1152 | .set_freq = adis16400_set_freq, |
1165 | .get_freq = adis16400_get_freq, | 1153 | .get_freq = adis16400_get_freq, |
1166 | }, | 1154 | }, |
@@ -1172,7 +1160,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1172 | .accel_scale_micro = IIO_G_TO_M_S_2(333), /* 0.333 mg */ | 1160 | .accel_scale_micro = IIO_G_TO_M_S_2(333), /* 0.333 mg */ |
1173 | .temp_scale_nano = 136000000, /* 0.136 C */ | 1161 | .temp_scale_nano = 136000000, /* 0.136 C */ |
1174 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ | 1162 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ |
1175 | .default_scan_mask = 0x7FF, | ||
1176 | .set_freq = adis16400_set_freq, | 1163 | .set_freq = adis16400_set_freq, |
1177 | .get_freq = adis16400_get_freq, | 1164 | .get_freq = adis16400_get_freq, |
1178 | }, | 1165 | }, |
@@ -1184,7 +1171,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1184 | .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */ | 1171 | .accel_scale_micro = IIO_G_TO_M_S_2(1000), /* 1 mg */ |
1185 | .temp_scale_nano = 136000000, /* 0.136 C */ | 1172 | .temp_scale_nano = 136000000, /* 0.136 C */ |
1186 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ | 1173 | .temp_offset = 25000000 / 136000, /* 25 C = 0x00 */ |
1187 | .default_scan_mask = 0x7FF, | ||
1188 | .set_freq = adis16400_set_freq, | 1174 | .set_freq = adis16400_set_freq, |
1189 | .get_freq = adis16400_get_freq, | 1175 | .get_freq = adis16400_get_freq, |
1190 | }, | 1176 | }, |
@@ -1194,7 +1180,6 @@ static struct adis16400_chip_info adis16400_chips[] = { | |||
1194 | .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE, | 1180 | .flags = ADIS16400_HAS_PROD_ID | ADIS16400_HAS_SLOW_MODE, |
1195 | .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */ | 1181 | .gyro_scale_micro = IIO_DEGREE_TO_RAD(50000), /* 0.05 deg/s */ |
1196 | .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */ | 1182 | .accel_scale_micro = IIO_G_TO_M_S_2(3333), /* 3.333 mg */ |
1197 | .default_scan_mask = 0xFFF, | ||
1198 | .temp_scale_nano = 140000000, /* 0.14 C */ | 1183 | .temp_scale_nano = 140000000, /* 0.14 C */ |
1199 | .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */ | 1184 | .temp_offset = 25000000 / 140000, /* 25 C = 0x00 */ |
1200 | .set_freq = adis16400_set_freq, | 1185 | .set_freq = adis16400_set_freq, |