Skip to content

Commit

Permalink
iio: st_sensors: miscellaneous cleanup
Browse files Browse the repository at this point in the history
Miscellaneous cleanup to fix minor consistency, grammar, and spelling
issues.

Signed-off-by: Martin Kelly <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
  • Loading branch information
martingkelly authored and jic23 committed Oct 21, 2018
1 parent 4cd62a5 commit 2019738
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions drivers/iio/common/st_sensors/st_sensors_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,

for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
if (sensor_settings->fs.fs_avl[i].num == 0)
goto st_sensors_match_odr_error;
return ret;

if (sensor_settings->fs.fs_avl[i].num == fs) {
*index_fs_avl = i;
Expand All @@ -142,7 +142,6 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
}
}

st_sensors_match_odr_error:
return ret;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/iio/common/st_sensors/st_sensors_trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static irqreturn_t st_sensors_irq_thread(int irq, void *p)
return IRQ_HANDLED;

/*
* If we are using egde IRQs, new samples arrived while processing
* If we are using edge IRQs, new samples arrived while processing
* the IRQ and those may be missed unless we pick them here, so poll
* again. If the sensor delivery frequency is very high, this thread
* turns into a polled loop handler.
Expand Down Expand Up @@ -148,7 +148,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
if (!sdata->sensor_settings->drdy_irq.addr_ihl) {
dev_err(&indio_dev->dev,
"falling/low specified for IRQ "
"but hardware only support rising/high: "
"but hardware supports only rising/high: "
"will request rising/high\n");
if (irq_trig == IRQF_TRIGGER_FALLING)
irq_trig = IRQF_TRIGGER_RISING;
Expand Down
6 changes: 3 additions & 3 deletions drivers/iio/magnetometer/st_magn_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#define ST_MAGN_NUMBER_DATA_CHANNELS 3

/* DEFAULT VALUE FOR SENSORS */
#define ST_MAGN_DEFAULT_OUT_X_H_ADDR 0X03
#define ST_MAGN_DEFAULT_OUT_Y_H_ADDR 0X07
#define ST_MAGN_DEFAULT_OUT_Z_H_ADDR 0X05
#define ST_MAGN_DEFAULT_OUT_X_H_ADDR 0x03
#define ST_MAGN_DEFAULT_OUT_Y_H_ADDR 0x07
#define ST_MAGN_DEFAULT_OUT_Z_H_ADDR 0x05

/* FULLSCALE */
#define ST_MAGN_FS_AVL_1300MG 1300
Expand Down

0 comments on commit 2019738

Please sign in to comment.