| Message ID | 20230220122552.925216-6-m.felsch@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | e94230755641d4832f28b7997755dbf0acac7b54 |
| Headers | show |
| Series | Add TI TMP116 Support | expand |
On Mon, 20 Feb 2023 13:25:52 +0100 Marco Felsch <m.felsch@pengutronix.de> wrote: > Align the code correctly if possible and align the channel bit mask to > make it easier to read. > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> Hi Marco, Rest of the series looks good to me now. We are early in the cycle, otherwise I might just have made those tweaks suggested in patch 2 whilst applying to make sure we didn't run out of time. Given lots of time available I'm taking the lazier approach and bouncing it back to you one last time! Thanks, Jonathan > --- > v4: > - no changes > v3: > - no changes > v2: > - no changes > > drivers/iio/temperature/tmp117.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/temperature/tmp117.c b/drivers/iio/temperature/tmp117.c > index 4915aceb66ee2..5bc68c6392ff6 100644 > --- a/drivers/iio/temperature/tmp117.c > +++ b/drivers/iio/temperature/tmp117.c > @@ -43,8 +43,8 @@ struct tmp117_data { > }; > > static int tmp117_read_raw(struct iio_dev *indio_dev, > - struct iio_chan_spec const *channel, int *val, > - int *val2, long mask) > + struct iio_chan_spec const *channel, int *val, > + int *val2, long mask) > { > struct tmp117_data *data = iio_priv(indio_dev); > s32 ret; > @@ -52,7 +52,7 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, > switch (mask) { > case IIO_CHAN_INFO_RAW: > ret = i2c_smbus_read_word_swapped(data->client, > - TMP117_REG_TEMP); > + TMP117_REG_TEMP); > if (ret < 0) > return ret; > *val = sign_extend32(ret, 15); > @@ -60,7 +60,7 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, > > case IIO_CHAN_INFO_CALIBBIAS: > ret = i2c_smbus_read_word_swapped(data->client, > - TMP117_REG_TEMP_OFFSET); > + TMP117_REG_TEMP_OFFSET); > if (ret < 0) > return ret; > *val = sign_extend32(ret, 15); > @@ -82,9 +82,8 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, > } > } > > -static int tmp117_write_raw(struct iio_dev *indio_dev, > - struct iio_chan_spec const *channel, int val, > - int val2, long mask) > +static int tmp117_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec > + const *channel, int val, int val2, long mask) > { > struct tmp117_data *data = iio_priv(indio_dev); > s16 off; > @@ -107,7 +106,9 @@ static const struct iio_chan_spec tmp117_channels[] = { > { > .type = IIO_TEMP, > .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > - BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_SCALE), > + BIT(IIO_CHAN_INFO_CALIBBIAS) | > + BIT(IIO_CHAN_INFO_SCALE), > + }, > }; > > static const struct iio_chan_spec tmp116_channels[] = {
diff --git a/drivers/iio/temperature/tmp117.c b/drivers/iio/temperature/tmp117.c index 4915aceb66ee2..5bc68c6392ff6 100644 --- a/drivers/iio/temperature/tmp117.c +++ b/drivers/iio/temperature/tmp117.c @@ -43,8 +43,8 @@ struct tmp117_data { }; static int tmp117_read_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *channel, int *val, - int *val2, long mask) + struct iio_chan_spec const *channel, int *val, + int *val2, long mask) { struct tmp117_data *data = iio_priv(indio_dev); s32 ret; @@ -52,7 +52,7 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_RAW: ret = i2c_smbus_read_word_swapped(data->client, - TMP117_REG_TEMP); + TMP117_REG_TEMP); if (ret < 0) return ret; *val = sign_extend32(ret, 15); @@ -60,7 +60,7 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_CALIBBIAS: ret = i2c_smbus_read_word_swapped(data->client, - TMP117_REG_TEMP_OFFSET); + TMP117_REG_TEMP_OFFSET); if (ret < 0) return ret; *val = sign_extend32(ret, 15); @@ -82,9 +82,8 @@ static int tmp117_read_raw(struct iio_dev *indio_dev, } } -static int tmp117_write_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *channel, int val, - int val2, long mask) +static int tmp117_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec + const *channel, int val, int val2, long mask) { struct tmp117_data *data = iio_priv(indio_dev); s16 off; @@ -107,7 +106,9 @@ static const struct iio_chan_spec tmp117_channels[] = { { .type = IIO_TEMP, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_SCALE), + BIT(IIO_CHAN_INFO_CALIBBIAS) | + BIT(IIO_CHAN_INFO_SCALE), + }, }; static const struct iio_chan_spec tmp116_channels[] = {
Align the code correctly if possible and align the channel bit mask to make it easier to read. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> --- v4: - no changes v3: - no changes v2: - no changes drivers/iio/temperature/tmp117.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)