diff options
-rw-r--r-- | drivers/staging/iio/accel/adis16201_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16204_core.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/accel/adis16209_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/accel/kxsd9.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/cdc/ad7150.c | 12 | ||||
-rw-r--r-- | drivers/staging/iio/cdc/ad7152.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/cdc/ad7746.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/gyro/adis16260_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/magnetometer/hmc5843.c | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c index 8e37d6e0427..5d2ae5dc380 100644 --- a/drivers/staging/iio/accel/adis16201_core.c +++ b/drivers/staging/iio/accel/adis16201_core.c | |||
@@ -345,7 +345,7 @@ static int adis16201_read_raw(struct iio_dev *indio_dev, | |||
345 | break; | 345 | break; |
346 | default: | 346 | default: |
347 | return -EINVAL; | 347 | return -EINVAL; |
348 | }; | 348 | } |
349 | mutex_lock(&indio_dev->mlock); | 349 | mutex_lock(&indio_dev->mlock); |
350 | addr = adis16201_addresses[chan->address][1]; | 350 | addr = adis16201_addresses[chan->address][1]; |
351 | ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16); | 351 | ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16); |
@@ -382,7 +382,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev, | |||
382 | break; | 382 | break; |
383 | default: | 383 | default: |
384 | return -EINVAL; | 384 | return -EINVAL; |
385 | }; | 385 | } |
386 | val16 = val & ((1 << bits) - 1); | 386 | val16 = val & ((1 << bits) - 1); |
387 | addr = adis16201_addresses[chan->address][1]; | 387 | addr = adis16201_addresses[chan->address][1]; |
388 | return adis16201_spi_write_reg_16(indio_dev, addr, val16); | 388 | return adis16201_spi_write_reg_16(indio_dev, addr, val16); |
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c index 05bdb7c2c8e..c6bf6419743 100644 --- a/drivers/staging/iio/accel/adis16204_core.c +++ b/drivers/staging/iio/accel/adis16204_core.c | |||
@@ -389,7 +389,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev, | |||
389 | break; | 389 | break; |
390 | default: | 390 | default: |
391 | return -EINVAL; | 391 | return -EINVAL; |
392 | }; | 392 | } |
393 | val16 = val & ((1 << bits) - 1); | 393 | val16 = val & ((1 << bits) - 1); |
394 | addr = adis16204_addresses[chan->address][1]; | 394 | addr = adis16204_addresses[chan->address][1]; |
395 | return adis16204_spi_write_reg_16(indio_dev, addr, val16); | 395 | return adis16204_spi_write_reg_16(indio_dev, addr, val16); |
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c index b7333bfe0b2..4f70efd4ed9 100644 --- a/drivers/staging/iio/accel/adis16209_core.c +++ b/drivers/staging/iio/accel/adis16209_core.c | |||
@@ -295,7 +295,7 @@ static int adis16209_write_raw(struct iio_dev *indio_dev, | |||
295 | break; | 295 | break; |
296 | default: | 296 | default: |
297 | return -EINVAL; | 297 | return -EINVAL; |
298 | }; | 298 | } |
299 | val16 = val & ((1 << bits) - 1); | 299 | val16 = val & ((1 << bits) - 1); |
300 | addr = adis16209_addresses[chan->address][1]; | 300 | addr = adis16209_addresses[chan->address][1]; |
301 | return adis16209_spi_write_reg_16(indio_dev, addr, val16); | 301 | return adis16209_spi_write_reg_16(indio_dev, addr, val16); |
@@ -373,7 +373,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, | |||
373 | break; | 373 | break; |
374 | default: | 374 | default: |
375 | return -EINVAL; | 375 | return -EINVAL; |
376 | }; | 376 | } |
377 | mutex_lock(&indio_dev->mlock); | 377 | mutex_lock(&indio_dev->mlock); |
378 | addr = adis16209_addresses[chan->address][1]; | 378 | addr = adis16209_addresses[chan->address][1]; |
379 | ret = adis16209_spi_read_reg_16(indio_dev, addr, &val16); | 379 | ret = adis16209_spi_read_reg_16(indio_dev, addr, &val16); |
diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c index fdd5fbded66..e8e6e3fbcec 100644 --- a/drivers/staging/iio/accel/kxsd9.c +++ b/drivers/staging/iio/accel/kxsd9.c | |||
@@ -171,7 +171,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev, | |||
171 | *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK]; | 171 | *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK]; |
172 | ret = IIO_VAL_INT_PLUS_MICRO; | 172 | ret = IIO_VAL_INT_PLUS_MICRO; |
173 | break; | 173 | break; |
174 | }; | 174 | } |
175 | 175 | ||
176 | error_ret: | 176 | error_ret: |
177 | return ret; | 177 | return ret; |
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index ca7c1fa88e7..df5bba284b7 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c | |||
@@ -351,7 +351,7 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio) | |||
351 | writel(chan_value, lradc->base + LRADC_CH(ofs)); | 351 | writel(chan_value, lradc->base + LRADC_CH(ofs)); |
352 | enable |= 1 << ofs; | 352 | enable |= 1 << ofs; |
353 | ofs++; | 353 | ofs++; |
354 | }; | 354 | } |
355 | 355 | ||
356 | writel(LRADC_DELAY_TRIGGER_LRADCS_MASK | LRADC_DELAY_KICK, | 356 | writel(LRADC_DELAY_TRIGGER_LRADCS_MASK | LRADC_DELAY_KICK, |
357 | lradc->base + LRADC_DELAY(0) + STMP_OFFSET_REG_CLR); | 357 | lradc->base + LRADC_DELAY(0) + STMP_OFFSET_REG_CLR); |
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c index 6a4041417d4..c72a6c074b4 100644 --- a/drivers/staging/iio/cdc/ad7150.c +++ b/drivers/staging/iio/cdc/ad7150.c | |||
@@ -156,7 +156,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, u64 event_code) | |||
156 | return !adaptive && (threshtype == 0x1); | 156 | return !adaptive && (threshtype == 0x1); |
157 | else | 157 | else |
158 | return !adaptive && (threshtype == 0x0); | 158 | return !adaptive && (threshtype == 0x0); |
159 | }; | 159 | } |
160 | return -EINVAL; | 160 | return -EINVAL; |
161 | } | 161 | } |
162 | 162 | ||
@@ -194,7 +194,7 @@ static int ad7150_write_event_params(struct iio_dev *indio_dev, u64 event_code) | |||
194 | break; | 194 | break; |
195 | default: | 195 | default: |
196 | return -EINVAL; | 196 | return -EINVAL; |
197 | }; | 197 | } |
198 | ret = i2c_smbus_write_byte_data(chip->client, | 198 | ret = i2c_smbus_write_byte_data(chip->client, |
199 | ad7150_addresses[chan][4], | 199 | ad7150_addresses[chan][4], |
200 | sens); | 200 | sens); |
@@ -257,7 +257,7 @@ static int ad7150_write_event_config(struct iio_dev *indio_dev, | |||
257 | default: | 257 | default: |
258 | ret = -EINVAL; | 258 | ret = -EINVAL; |
259 | goto error_ret; | 259 | goto error_ret; |
260 | }; | 260 | } |
261 | 261 | ||
262 | cfg |= (!adaptive << 7) | (thresh_type << 5); | 262 | cfg |= (!adaptive << 7) | (thresh_type << 5); |
263 | 263 | ||
@@ -327,7 +327,7 @@ static int ad7150_write_event_value(struct iio_dev *indio_dev, | |||
327 | default: | 327 | default: |
328 | ret = -EINVAL; | 328 | ret = -EINVAL; |
329 | goto error_ret; | 329 | goto error_ret; |
330 | }; | 330 | } |
331 | 331 | ||
332 | /* write back if active */ | 332 | /* write back if active */ |
333 | ret = ad7150_write_event_params(indio_dev, event_code); | 333 | ret = ad7150_write_event_params(indio_dev, event_code); |
@@ -360,7 +360,7 @@ static ssize_t ad7150_show_timeout(struct device *dev, | |||
360 | break; | 360 | break; |
361 | default: | 361 | default: |
362 | return -EINVAL; | 362 | return -EINVAL; |
363 | }; | 363 | } |
364 | 364 | ||
365 | return sprintf(buf, "%d\n", value); | 365 | return sprintf(buf, "%d\n", value); |
366 | } | 366 | } |
@@ -394,7 +394,7 @@ static ssize_t ad7150_store_timeout(struct device *dev, | |||
394 | default: | 394 | default: |
395 | ret = -EINVAL; | 395 | ret = -EINVAL; |
396 | goto error_ret; | 396 | goto error_ret; |
397 | }; | 397 | } |
398 | 398 | ||
399 | ret = ad7150_write_event_params(indio_dev, this_attr->address); | 399 | ret = ad7150_write_event_params(indio_dev, this_attr->address); |
400 | error_ret: | 400 | error_ret: |
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c index 98c3015116a..288b33e8dad 100644 --- a/drivers/staging/iio/cdc/ad7152.c +++ b/drivers/staging/iio/cdc/ad7152.c | |||
@@ -405,7 +405,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev, | |||
405 | break; | 405 | break; |
406 | default: | 406 | default: |
407 | ret = -EINVAL; | 407 | ret = -EINVAL; |
408 | }; | 408 | } |
409 | out: | 409 | out: |
410 | mutex_unlock(&indio_dev->mlock); | 410 | mutex_unlock(&indio_dev->mlock); |
411 | return ret; | 411 | return ret; |
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c index 754e11e8719..e6c11d934ad 100644 --- a/drivers/staging/iio/cdc/ad7746.c +++ b/drivers/staging/iio/cdc/ad7746.c | |||
@@ -677,7 +677,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev, | |||
677 | break; | 677 | break; |
678 | default: | 678 | default: |
679 | ret = -EINVAL; | 679 | ret = -EINVAL; |
680 | }; | 680 | } |
681 | out: | 681 | out: |
682 | mutex_unlock(&indio_dev->mlock); | 682 | mutex_unlock(&indio_dev->mlock); |
683 | return ret; | 683 | return ret; |
diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c index 9571c03aa4c..ff16430a0d2 100644 --- a/drivers/staging/iio/gyro/adis16260_core.c +++ b/drivers/staging/iio/gyro/adis16260_core.c | |||
@@ -528,7 +528,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, | |||
528 | break; | 528 | break; |
529 | default: | 529 | default: |
530 | return -EINVAL; | 530 | return -EINVAL; |
531 | }; | 531 | } |
532 | mutex_lock(&indio_dev->mlock); | 532 | mutex_lock(&indio_dev->mlock); |
533 | addr = adis16260_addresses[chan->address][1]; | 533 | addr = adis16260_addresses[chan->address][1]; |
534 | ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16); | 534 | ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16); |
@@ -548,7 +548,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, | |||
548 | break; | 548 | break; |
549 | default: | 549 | default: |
550 | return -EINVAL; | 550 | return -EINVAL; |
551 | }; | 551 | } |
552 | mutex_lock(&indio_dev->mlock); | 552 | mutex_lock(&indio_dev->mlock); |
553 | addr = adis16260_addresses[chan->address][2]; | 553 | addr = adis16260_addresses[chan->address][2]; |
554 | ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16); | 554 | ret = adis16260_spi_read_reg_16(indio_dev, addr, &val16); |
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c index 10e095486e5..f7edf69a3bc 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.c +++ b/drivers/staging/iio/magnetometer/hmc5843.c | |||
@@ -555,7 +555,7 @@ static int hmc5843_read_raw(struct iio_dev *indio_dev, | |||
555 | *val = 0; | 555 | *val = 0; |
556 | *val2 = data->variant->regval_to_nanoscale[data->range]; | 556 | *val2 = data->variant->regval_to_nanoscale[data->range]; |
557 | return IIO_VAL_INT_PLUS_NANO; | 557 | return IIO_VAL_INT_PLUS_NANO; |
558 | }; | 558 | } |
559 | return -EINVAL; | 559 | return -EINVAL; |
560 | } | 560 | } |
561 | 561 | ||