In v3.10-rc1 the Analog Devices ADT7310/ADT7410 temperature sensor
driver was removed as an IIO driver. But it was apparently overlooked to
rename four references to CONFIG_ADT7310 and CONFIG_ADT7410 to
CONFIG_SENSORS_ADT7310 and CONFIG_SENSORS_ADT7410 respectively. Do so
now. Use the IS_ENABLED() macro, while we're at it.
Signed-off-by: Paul Bolle <pebo...@tiscali.nl>
---
0) The previous version ("Blackfin: bf537: rename "CONFIG_ADT7410"")
assumed an earlier patch had been applied upstream. That patch can be
found at https://lkml.org/lkml/2013/3/25/194 . But it is actually only
applied locally, on a branch that I use to do patches like these. It was
trivial to squash both patches into one patch.
1) Still untested. The choice for SENSORS_ADT7310 and SENSORS_ADT7410 is
still just educated guesswork.
2) It was commit cddc1424f39e7c04045a6431eaf13a003fb8335a ("staging:iio:
Remove adt7410 driver") that triggered this patch.
arch/blackfin/mach-bf537/boards/stamp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c
b/arch/blackfin/mach-bf537/boards/stamp.c
index 759a430..90d2ab1 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -701,7 +701,7 @@ static struct bfin5xx_spi_chip ad7816_spi_chip_info = {
};
#endif
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_ADT7310)
static unsigned long adt7310_platform_data[3] = {
/* INT bound temperature alarm event. line 1 */
IRQ_PG4, IRQF_TRIGGER_LOW,
@@ -1063,7 +1063,7 @@ static struct spi_board_info bfin_spi_board_info[]
__initdata = {
},
#endif
-#if defined(CONFIG_ADT7310) || defined(CONFIG_ADT7310_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_ADT7310)
{
.modalias = "adt7310",
.max_speed_hz = 1000000,
@@ -2161,7 +2161,7 @@ static struct platform_device
ad5398_userspace_consumer_device = {
#endif
#endif
-#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_ADT7410)
/* INT bound temperature alarm event. line 1 */
static unsigned long adt7410_platform_data[2] = {
IRQ_PG4, IRQF_TRIGGER_LOW,
@@ -2229,7 +2229,7 @@ static struct i2c_board_info __initdata
bfin_i2c_board_info[] = {
},
#endif
-#if defined(CONFIG_ADT7410) || defined(CONFIG_ADT7410_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_ADT7410)
{
I2C_BOARD_INFO("adt7410", 0x48),
/* CT critical temperature event. line 0 */
--
1.7.11.7
_______________________________________________
Uclinux-dist-devel mailing list
Uclinux-dist-devel@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/uclinux-dist-devel
