* [PATCH v2] iio: st_sensors: miscellaneous cleanup
@ 2018-10-16 3:27 Martin Kelly
2018-10-21 14:34 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Martin Kelly @ 2018-10-16 3:27 UTC (permalink / raw)
To: linux-iio
Cc: Jonathan Cameron, Lars-Peter Clausen, Peter Meerwald-Stadler,
Martin Kelly
From: Martin Kelly <martin@martingkelly.com>
Miscellaneous cleanup to fix minor consistency, grammar, and spelling
issues.
Signed-off-by: Martin Kelly <martin@martingkelly.com>
---
v2:
- Explicit return, eliminating goto st_sensors_match_odr_error.
drivers/iio/common/st_sensors/st_sensors_core.c | 3 +--
drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 ++--
drivers/iio/magnetometer/st_magn_core.c | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 26fbd1bd9413..e50c975250e9 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -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;
@@ -142,7 +142,6 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
}
}
-st_sensors_match_odr_error:
return ret;
}
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index fdcc5a891958..224596b0e189 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -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.
@@ -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;
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 72f6d1335a04..880c11c7f1cb 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -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
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] iio: st_sensors: miscellaneous cleanup
2018-10-16 3:27 [PATCH v2] iio: st_sensors: miscellaneous cleanup Martin Kelly
@ 2018-10-21 14:34 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2018-10-21 14:34 UTC (permalink / raw)
To: Martin Kelly; +Cc: linux-iio, Lars-Peter Clausen, Peter Meerwald-Stadler
On Mon, 15 Oct 2018 20:27:09 -0700
Martin Kelly <martin@martingkelly.com> wrote:
> From: Martin Kelly <martin@martingkelly.com>
>
> Miscellaneous cleanup to fix minor consistency, grammar, and spelling
> issues.
>
> Signed-off-by: Martin Kelly <martin@martingkelly.com>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> v2:
> - Explicit return, eliminating goto st_sensors_match_odr_error.
>
> drivers/iio/common/st_sensors/st_sensors_core.c | 3 +--
> drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 ++--
> drivers/iio/magnetometer/st_magn_core.c | 6 +++---
> 3 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index 26fbd1bd9413..e50c975250e9 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -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;
> @@ -142,7 +142,6 @@ static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
> }
> }
>
> -st_sensors_match_odr_error:
> return ret;
> }
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> index fdcc5a891958..224596b0e189 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> @@ -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.
> @@ -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;
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index 72f6d1335a04..880c11c7f1cb 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -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
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-21 22:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-16 3:27 [PATCH v2] iio: st_sensors: miscellaneous cleanup Martin Kelly
2018-10-21 14:34 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.