* [PATCH] Blackfin: bf537: rename "CONFIG_AD7314"
@ 2013-04-04 10:08 Paul Bolle
2013-04-04 10:17 ` Paul Bolle
0 siblings, 1 reply; 4+ messages in thread
From: Paul Bolle @ 2013-04-04 10:08 UTC (permalink / raw)
To: Mike Frysinger
Cc: Jonathan Cameron, Guenter Roeck, Michael Hennerich,
uclinux-dist-devel, linux-kernel
In v3.2 the Analog Devices AD7314 temperature sensor driver was removed
as an IIO driver and added as a HWMON driver. But it was apparently
overlooked to rename two references to CONFIG_AD7314 to
CONFIG_SENSORS_AD7314. Do so now. Use the IS_ENABLED() macro, while
we're at it.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Entirely untested.
1) See commits 4f3a659581cabf1be441d6467b523be914615496 ("hwmon: AD7314
driver (ported from IIO)") and 48a2c3799b7141c271a771d3249142a104faeefc
("staging:iio:adc:ad7314 removal. Supported via hwmon.") for the two
patches involved.
arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 23bb55d..b40b849 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -681,7 +681,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
};
#endif
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
.enable_dma = 0,
};
@@ -1039,7 +1039,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif
-#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_AD7314)
{
.modalias = "ad7314",
.max_speed_hz = 1000000,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Blackfin: bf537: rename "CONFIG_AD7314"
2013-04-04 10:08 [PATCH] Blackfin: bf537: rename "CONFIG_AD7314" Paul Bolle
@ 2013-04-04 10:17 ` Paul Bolle
2013-04-04 12:07 ` Guenter Roeck
0 siblings, 1 reply; 4+ messages in thread
From: Paul Bolle @ 2013-04-04 10:17 UTC (permalink / raw)
To: Mike Frysinger
Cc: Jonathan Cameron, Guenter Roeck, Michael Hennerich,
uclinux-dist-devel, linux-kernel
[Forwarded to a recent address of Guenter, as the ericsson address
bounces.]
Paul Bolle
On Thu, 2013-04-04 at 12:08 +0200, Paul Bolle wrote:
> In v3.2 the Analog Devices AD7314 temperature sensor driver was removed
> as an IIO driver and added as a HWMON driver. But it was apparently
> overlooked to rename two references to CONFIG_AD7314 to
> CONFIG_SENSORS_AD7314. Do so now. Use the IS_ENABLED() macro, while
> we're at it.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> 0) Entirely untested.
>
> 1) See commits 4f3a659581cabf1be441d6467b523be914615496 ("hwmon: AD7314
> driver (ported from IIO)") and 48a2c3799b7141c271a771d3249142a104faeefc
> ("staging:iio:adc:ad7314 removal. Supported via hwmon.") for the two
> patches involved.
>
> arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 23bb55d..b40b849 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -681,7 +681,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
> };
> #endif
>
> -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
> .enable_dma = 0,
> };
> @@ -1039,7 +1039,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
> },
> #endif
>
> -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> {
> .modalias = "ad7314",
> .max_speed_hz = 1000000,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Blackfin: bf537: rename "CONFIG_AD7314"
2013-04-04 10:17 ` Paul Bolle
@ 2013-04-04 12:07 ` Guenter Roeck
2014-02-13 10:08 ` Paul Bolle
0 siblings, 1 reply; 4+ messages in thread
From: Guenter Roeck @ 2013-04-04 12:07 UTC (permalink / raw)
To: Paul Bolle
Cc: Mike Frysinger, Jonathan Cameron, Michael Hennerich,
uclinux-dist-devel, linux-kernel
On Thu, Apr 04, 2013 at 12:17:03PM +0200, Paul Bolle wrote:
> [Forwarded to a recent address of Guenter, as the ericsson address
> bounces.]
>
> Paul Bolle
>
> On Thu, 2013-04-04 at 12:08 +0200, Paul Bolle wrote:
> > In v3.2 the Analog Devices AD7314 temperature sensor driver was removed
> > as an IIO driver and added as a HWMON driver. But it was apparently
> > overlooked to rename two references to CONFIG_AD7314 to
> > CONFIG_SENSORS_AD7314. Do so now. Use the IS_ENABLED() macro, while
> > we're at it.
> >
> > Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> > ---
> > 0) Entirely untested.
> >
> > 1) See commits 4f3a659581cabf1be441d6467b523be914615496 ("hwmon: AD7314
> > driver (ported from IIO)") and 48a2c3799b7141c271a771d3249142a104faeefc
> > ("staging:iio:adc:ad7314 removal. Supported via hwmon.") for the two
> > patches involved.
> >
> > arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> > index 23bb55d..b40b849 100644
> > --- a/arch/blackfin/mach-bf537/boards/stamp.c
> > +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> > @@ -681,7 +681,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
> > };
> > #endif
> >
> > -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> > +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> > static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
> > .enable_dma = 0,
> > };
> > @@ -1039,7 +1039,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
> > },
> > #endif
> >
> > -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> > +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> > {
> > .modalias = "ad7314",
> > .max_speed_hz = 1000000,
>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Really wonder ... there should be a better solution than all those ifdefs.
Guenter
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Blackfin: bf537: rename "CONFIG_AD7314"
2013-04-04 12:07 ` Guenter Roeck
@ 2014-02-13 10:08 ` Paul Bolle
0 siblings, 0 replies; 4+ messages in thread
From: Paul Bolle @ 2014-02-13 10:08 UTC (permalink / raw)
To: Guenter Roeck
Cc: Steven Miao, Jonathan Cameron, Michael Hennerich,
adi-buildroot-devel, linux-kernel
[Replaced previous maintainer and list with current maintainer and
list.]
On Thu, 2013-04-04 at 05:07 -0700, Guenter Roeck wrote:
> On Thu, Apr 04, 2013 at 12:17:03PM +0200, Paul Bolle wrote:
> > [Forwarded to a recent address of Guenter, as the ericsson address
> > bounces.]
> >
> > Paul Bolle
> >
> > On Thu, 2013-04-04 at 12:08 +0200, Paul Bolle wrote:
> > > In v3.2 the Analog Devices AD7314 temperature sensor driver was removed
> > > as an IIO driver and added as a HWMON driver. But it was apparently
> > > overlooked to rename two references to CONFIG_AD7314 to
> > > CONFIG_SENSORS_AD7314. Do so now. Use the IS_ENABLED() macro, while
> > > we're at it.
> > >
> > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> > > ---
> > > 0) Entirely untested.
> > >
> > > 1) See commits 4f3a659581cabf1be441d6467b523be914615496 ("hwmon: AD7314
> > > driver (ported from IIO)") and 48a2c3799b7141c271a771d3249142a104faeefc
> > > ("staging:iio:adc:ad7314 removal. Supported via hwmon.") for the two
> > > patches involved.
> > >
> > > arch/blackfin/mach-bf537/boards/stamp.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> > > index 23bb55d..b40b849 100644
> > > --- a/arch/blackfin/mach-bf537/boards/stamp.c
> > > +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> > > @@ -681,7 +681,7 @@ static struct bfin5xx_spi_chip ad2s1210_spi_chip_info = {
> > > };
> > > #endif
> > >
> > > -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> > > +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> > > static struct bfin5xx_spi_chip ad7314_spi_chip_info = {
> > > .enable_dma = 0,
> > > };
> > > @@ -1039,7 +1039,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
> > > },
> > > #endif
> > >
> > > -#if defined(CONFIG_AD7314) || defined(CONFIG_AD7314_MODULE)
> > > +#if IS_ENABLED(CONFIG_SENSORS_AD7314)
> > > {
> > > .modalias = "ad7314",
> > > .max_speed_hz = 1000000,
> >
> Acked-by: Guenter Roeck <linux@roeck-us.net>
>
> Really wonder ... there should be a better solution than all those ifdefs.
This issue is still present in v3.14-rc2. Can someone please have
(another) look at this?
Paul Bolle
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-13 10:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 10:08 [PATCH] Blackfin: bf537: rename "CONFIG_AD7314" Paul Bolle
2013-04-04 10:17 ` Paul Bolle
2013-04-04 12:07 ` Guenter Roeck
2014-02-13 10:08 ` Paul Bolle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox