From: Jonathan Cameron <jic23@kernel.org>
To: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Jacopo Mondi <jacopo+renesas@jmondi.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
linux-iio@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH] iio: adc: max9611: Make enum relations more future proof
Date: Sat, 16 Nov 2019 16:25:22 +0000 [thread overview]
Message-ID: <20191116162522.1e68243c@archlinux> (raw)
In-Reply-To: <20191114072803.GC26902@bigcity.dyn.berto.se>
On Thu, 14 Nov 2019 08:28:03 +0100
Niklas Söderlund <niklas.soderlund@ragnatech.se> wrote:
> Hi Geert,
>
> Looks good.
>
> On 2019-11-13 11:09:38 +0100, Geert Uytterhoeven wrote:
> > The relations between enum values and array indices values are currently
> > not enforced by the code, which makes them fragile w.r.t. future
> > changes.
> >
> > Fix this by:
> > 1. Using designated array initializers, to make sure array indices and
> > enums values match,
> > 2. Linking max9611_csa_gain enum values to the corresponding
> > max9611_conf_ids enum values, as the latter is cast to the former
> > in max9611_read_csa_voltage().
> >
> > No change in generated code.
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Looks good to me, but I'd like to leave a little longer for any
feedback from Jacopo as author of the driver.
Thanks,
Jonathan
>
> > ---
> > drivers/iio/adc/max9611.c | 36 +++++++++++-------------------------
> > 1 file changed, 11 insertions(+), 25 deletions(-)
> >
> > diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
> > index b0755f25356d700d..cb306ff1a5d6a0b2 100644
> > --- a/drivers/iio/adc/max9611.c
> > +++ b/drivers/iio/adc/max9611.c
> > @@ -114,22 +114,17 @@ enum max9611_conf_ids {
> > * where data shall be read from
> > */
> > static const unsigned int max9611_mux_conf[][2] = {
> > - /* CONF_SENSE_1x */
> > - { MAX9611_MUX_SENSE_1x, MAX9611_REG_CSA_DATA },
> > - /* CONF_SENSE_4x */
> > - { MAX9611_MUX_SENSE_4x, MAX9611_REG_CSA_DATA },
> > - /* CONF_SENSE_8x */
> > - { MAX9611_MUX_SENSE_8x, MAX9611_REG_CSA_DATA },
> > - /* CONF_IN_VOLT */
> > - { MAX9611_INPUT_VOLT, MAX9611_REG_RS_DATA },
> > - /* CONF_TEMP */
> > - { MAX9611_MUX_TEMP, MAX9611_REG_TEMP_DATA },
> > + [CONF_SENSE_1x] = { MAX9611_MUX_SENSE_1x, MAX9611_REG_CSA_DATA },
> > + [CONF_SENSE_4x] = { MAX9611_MUX_SENSE_4x, MAX9611_REG_CSA_DATA },
> > + [CONF_SENSE_8x] = { MAX9611_MUX_SENSE_8x, MAX9611_REG_CSA_DATA },
> > + [CONF_IN_VOLT] = { MAX9611_INPUT_VOLT, MAX9611_REG_RS_DATA },
> > + [CONF_TEMP] = { MAX9611_MUX_TEMP, MAX9611_REG_TEMP_DATA },
> > };
> >
> > enum max9611_csa_gain {
> > - CSA_GAIN_1x,
> > - CSA_GAIN_4x,
> > - CSA_GAIN_8x,
> > + CSA_GAIN_1x = CONF_SENSE_1x,
> > + CSA_GAIN_4x = CONF_SENSE_4x,
> > + CSA_GAIN_8x = CONF_SENSE_8x,
> > };
> >
> > enum max9611_csa_gain_params {
> > @@ -147,18 +142,9 @@ enum max9611_csa_gain_params {
> > * value; use this structure to retrieve the correct LSB and offset values.
> > */
> > static const unsigned int max9611_gain_conf[][2] = {
> > - { /* [0] CSA_GAIN_1x */
> > - MAX9611_CSA_1X_LSB_nV,
> > - MAX9611_CSA_1X_OFFS_RAW,
> > - },
> > - { /* [1] CSA_GAIN_4x */
> > - MAX9611_CSA_4X_LSB_nV,
> > - MAX9611_CSA_4X_OFFS_RAW,
> > - },
> > - { /* [2] CSA_GAIN_8x */
> > - MAX9611_CSA_8X_LSB_nV,
> > - MAX9611_CSA_8X_OFFS_RAW,
> > - },
> > + [CSA_GAIN_1x] = { MAX9611_CSA_1X_LSB_nV, MAX9611_CSA_1X_OFFS_RAW, },
> > + [CSA_GAIN_4x] = { MAX9611_CSA_4X_LSB_nV, MAX9611_CSA_4X_OFFS_RAW, },
> > + [CSA_GAIN_8x] = { MAX9611_CSA_8X_LSB_nV, MAX9611_CSA_8X_OFFS_RAW, },
> > };
> >
> > enum max9611_chan_addrs {
> > --
> > 2.17.1
> >
>
next prev parent reply other threads:[~2019-11-16 16:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 10:09 [PATCH] iio: adc: max9611: Make enum relations more future proof Geert Uytterhoeven
2019-11-14 7:28 ` Niklas Söderlund
2019-11-16 16:25 ` Jonathan Cameron [this message]
2019-11-16 16:54 ` Jacopo Mondi
2019-11-16 17:32 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191116162522.1e68243c@archlinux \
--to=jic23@kernel.org \
--cc=geert+renesas@glider.be \
--cc=jacopo+renesas@jmondi.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).