diff mbox series

[02/16] iio: adc: max1027: Fix the number of max1X31 channels

Message ID 20210818111139.330636-3-miquel.raynal@bootlin.com
State Accepted
Commit f0cb5fed37ab37f6a6c5463c5fd39b58a45670c8
Headers show
Series [01/16] iio: adc: max1027: Fix wrong shift with 12-bit devices | expand

Commit Message

Miquel Raynal Aug. 18, 2021, 11:11 a.m. UTC
The macro MAX1X29_CHANNELS() already calls MAX1X27_CHANNELS().
Calling MAX1X27_CHANNELS() before MAX1X29_CHANNELS() in the definition
of MAX1X31_CHANNELS() declares the first 8 channels twice. So drop this
extra call from the MAX1X31 channels list definition.

Fixes: 7af5257d8427 ("iio: adc: max1027: Prepare the introduction of different resolutions")
Cc: stable@vger.kernel.org
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/iio/adc/max1027.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Nuno Sa Aug. 20, 2021, 7:03 a.m. UTC | #1
> -----Original Message-----

> From: Miquel Raynal <miquel.raynal@bootlin.com>

> Sent: Wednesday, August 18, 2021 1:11 PM

> To: Jonathan Cameron <jic23@kernel.org>; Lars-Peter Clausen

> <lars@metafoo.de>

> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>; linux-

> iio@vger.kernel.org; linux-kernel@vger.kernel.org; Miquel Raynal

> <miquel.raynal@bootlin.com>; stable@vger.kernel.org

> Subject: [PATCH 02/16] iio: adc: max1027: Fix the number of max1X31

> channels

> 

> [External]

> 

> The macro MAX1X29_CHANNELS() already calls

> MAX1X27_CHANNELS().

> Calling MAX1X27_CHANNELS() before MAX1X29_CHANNELS() in the

> definition

> of MAX1X31_CHANNELS() declares the first 8 channels twice. So drop

> this

> extra call from the MAX1X31 channels list definition.

> 

> Fixes: 7af5257d8427 ("iio: adc: max1027: Prepare the introduction of

> different resolutions")

> Cc: stable@vger.kernel.org

> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

> ---

>  drivers/iio/adc/max1027.c | 1 -

>  1 file changed, 1 deletion(-)

> 

> diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c

> index 4a42d140a4b0..b753658bb41e 100644

> --- a/drivers/iio/adc/max1027.c

> +++ b/drivers/iio/adc/max1027.c

> @@ -142,7 +142,6 @@ MODULE_DEVICE_TABLE(of,

> max1027_adc_dt_ids);

>  	MAX1027_V_CHAN(11, depth)

> 

>  #define MAX1X31_CHANNELS(depth)			\

> -	MAX1X27_CHANNELS(depth),		\

>  	MAX1X29_CHANNELS(depth),		\

>  	MAX1027_V_CHAN(12, depth),		\

>  	MAX1027_V_CHAN(13, depth),		\

> --

> 2.27.0


Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Jonathan Cameron Aug. 30, 2021, 10 a.m. UTC | #2
On Fri, 20 Aug 2021 07:03:40 +0000
"Sa, Nuno" <Nuno.Sa@analog.com> wrote:

> > -----Original Message-----

> > From: Miquel Raynal <miquel.raynal@bootlin.com>

> > Sent: Wednesday, August 18, 2021 1:11 PM

> > To: Jonathan Cameron <jic23@kernel.org>; Lars-Peter Clausen

> > <lars@metafoo.de>

> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>; linux-

> > iio@vger.kernel.org; linux-kernel@vger.kernel.org; Miquel Raynal

> > <miquel.raynal@bootlin.com>; stable@vger.kernel.org

> > Subject: [PATCH 02/16] iio: adc: max1027: Fix the number of max1X31

> > channels

> > 

> > [External]

> > 

> > The macro MAX1X29_CHANNELS() already calls

> > MAX1X27_CHANNELS().

> > Calling MAX1X27_CHANNELS() before MAX1X29_CHANNELS() in the

> > definition

> > of MAX1X31_CHANNELS() declares the first 8 channels twice. So drop

> > this

> > extra call from the MAX1X31 channels list definition.

> > 

> > Fixes: 7af5257d8427 ("iio: adc: max1027: Prepare the introduction of

> > different resolutions")

> > Cc: stable@vger.kernel.org

> > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

> > ---

> >  drivers/iio/adc/max1027.c | 1 -

> >  1 file changed, 1 deletion(-)

> > 

> > diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c

> > index 4a42d140a4b0..b753658bb41e 100644

> > --- a/drivers/iio/adc/max1027.c

> > +++ b/drivers/iio/adc/max1027.c

> > @@ -142,7 +142,6 @@ MODULE_DEVICE_TABLE(of,

> > max1027_adc_dt_ids);

> >  	MAX1027_V_CHAN(11, depth)

> > 

> >  #define MAX1X31_CHANNELS(depth)			\

> > -	MAX1X27_CHANNELS(depth),		\

> >  	MAX1X29_CHANNELS(depth),		\

> >  	MAX1027_V_CHAN(12, depth),		\

> >  	MAX1027_V_CHAN(13, depth),		\

> > --

> > 2.27.0  

> 

> Reviewed-by: Nuno Sá <nuno.sa@analog.com>

> 

I guess we don't have many users of these devices as I would have expected
this to blow up spectacularly.  Ah well.  

Applied to the fixes-togreg branch of iio.git

Thanks,

Jonathan
diff mbox series

Patch

diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c
index 4a42d140a4b0..b753658bb41e 100644
--- a/drivers/iio/adc/max1027.c
+++ b/drivers/iio/adc/max1027.c
@@ -142,7 +142,6 @@  MODULE_DEVICE_TABLE(of, max1027_adc_dt_ids);
 	MAX1027_V_CHAN(11, depth)
 
 #define MAX1X31_CHANNELS(depth)			\
-	MAX1X27_CHANNELS(depth),		\
 	MAX1X29_CHANNELS(depth),		\
 	MAX1027_V_CHAN(12, depth),		\
 	MAX1027_V_CHAN(13, depth),		\