Skip to contentSkip to conversation

Blackfin: bf537: rename "CONFIG_ADT75"

PATCH In review Paul Bolle 3 participants 6 messages Apr 4, 2013 – Feb 13, 2014

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 Blackfin: bf537: rename "CONFIG_ADT75"

In v3.2 the Analog Devices ADT75 temperature sensor driver was removed as an IIO driver and support for it was added to the LM75 HWMON driver. But it was apparently overlooked to rename one reference to CONFIG_ADT75 to CONFIG_SENSORS_LM75. Do so now. Use the IS_ENABLED() macro, while we're at it.

---
0) Also untested.

1) See commits e96f9d89e6213c7630a3323cd0c754e7f2619564 ("hwmon: (lm75) Add support for Analog Devices ADT75") and cdea0bec8d37f2943ae500512b0c178bc76de6e3 ("iio: adc: remove ADT75 driver
- hwmon/lm75 will take over ADT75 support") for the two patches involved in this operation.

 arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
index b40b849..9735345 100644
@@ -2221,7 +2221,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 	},
 #endif
 
-#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_LM75)
 	{
 		I2C_BOARD_INFO("adt75", 0x9),
 		.irq = IRQ_PG5,
Signature · 1 line
1.7.11.7
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Paul Bolle

In v3.2 the Analog Devices ADT75 temperature sensor driver was removed as an IIO driver and support for it was added to the LM75 HWMON driver. But it was apparently overlooked to rename one reference to CONFIG_ADT75 to CONFIG_SENSORS_LM75. Do so now. Use the IS_ENABLED() macro, while we're at it.

---
0) Also untested.

Quoted 8 lines

1) See commits e96f9d89e6213c7630a3323cd0c754e7f2619564 ("hwmon: (lm75) Add support for Analog Devices ADT75") and cdea0bec8d37f2943ae500512b0c178bc76de6e3 ("iio: adc: remove ADT75 driver
- hwmon/lm75 will take over ADT75 support") for the two patches involved in this operation.

 arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This breakage is telling us something about the weird approach taken in this file, methinks.

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2226

Quoted 12 lines
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
index b40b849..9735345 100644
@@ -2221,7 +2221,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 	},
 #endif
 
-#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_LM75)
 	{
 		I2C_BOARD_INFO("adt75", 0x9),

Unrelated to this patch, but this is very odd, as the ADT75 can't have slave address 0x09. This address is almost exclusively used by battery chargers AFAIK.

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2227

Quoted 1 line
arch/blackfin/mach-bf537/boards/stamp.c +0 -0
 		.irq = IRQ_PG5,

The patch itself looks good.

Signature · 1 line
Jean Delvare
#2 lore raw
Quoted 17 lines · Jean Delvare
Quoted 16 lines · Paul Bolle

In v3.2 the Analog Devices ADT75 temperature sensor driver was removed as an IIO driver and support for it was added to the LM75 HWMON driver. But it was apparently overlooked to rename one reference to CONFIG_ADT75 to CONFIG_SENSORS_LM75. Do so now. Use the IS_ENABLED() macro, while we're at it.

---
0) Also untested.

1) See commits e96f9d89e6213c7630a3323cd0c754e7f2619564 ("hwmon: (lm75) Add support for Analog Devices ADT75") and cdea0bec8d37f2943ae500512b0c178bc76de6e3 ("iio: adc: remove ADT75 driver
- hwmon/lm75 will take over ADT75 support") for the two patches involved in this operation.

Quoted 6 lines
Quoted 2 lines
 arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This breakage is telling us something about the weird approach taken in this file, methinks.

Yes, they have persistent problems with renamed or moved drivers. I somewhat understood the need for SPI chips, but even there it seemed to me there should be a better solution.

Quoted 8 lines
Quoted 8 lines
arch/blackfin/mach-bf537/boards/stamp.c +0 -0
index b40b849..9735345 100644
@@ -2221,7 +2221,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 	},
 #endif
 
Quoted 9 lines

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2226

Quoted 4 lines
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
-#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_LM75)
 	{
 		I2C_BOARD_INFO("adt75", 0x9),

Unrelated to this patch, but this is very odd, as the ADT75 can't have slave address 0x09. This address is almost exclusively used by battery chargers AFAIK.

Either not really an ADT75, or it should have been 0x49.

Couple of lines down, CONFIG_ADT7410 has the same problem.

Guenter

Quoted 9 lines

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2227

Quoted 1 line
arch/blackfin/mach-bf537/boards/stamp.c +0 -0
 		.irq = IRQ_PG5,

The patch itself looks good.

Signature · 1 line
Jean Delvare
author
#3 lore raw
Quoted 7 lines · Guenter Roeck
Quoted 3 lines · Jean Delvare

This breakage is telling us something about the weird approach taken in this file, methinks.

Yes, they have persistent problems with renamed or moved drivers. I somewhat understood the need for SPI chips, but even there it seemed to me there should be a better solution.

The output of the (local) scripts I use mention about a dozen more (possible) problems in both Blackfin's stamp.c files. I'm roughly working my way back in git history, slowly, so those problems are probably older.

Since I know from previous cleaning up efforts that the Blackfin people know they have non-working code (eg, code not actually buildable since it has no working Kconfig support) I do not give Blackfin much priority. But this patch (and the other two related to the v3.2 release) were obvious oversights that I could as well fix right away.

Paul Bolle

#4 lore raw
Quoted 14 lines · Paul Bolle
Quoted 7 lines · Guenter Roeck
Quoted 3 lines · Jean Delvare

This breakage is telling us something about the weird approach taken in this file, methinks.

Yes, they have persistent problems with renamed or moved drivers. I somewhat understood the need for SPI chips, but even there it seemed to me there should be a better solution.

The output of the (local) scripts I use mention about a dozen more (possible) problems in both Blackfin's stamp.c files. I'm roughly working my way back in git history, slowly, so those problems are probably older.

Quoted 6 lines

Since I know from previous cleaning up efforts that the Blackfin people know they have non-working code (eg, code not actually buildable since it has no working Kconfig support) I do not give Blackfin much priority. But this patch (and the other two related to the v3.2 release) were obvious oversights that I could as well fix right away.

Makes me shiver ...

Guenter

author
#5 lore raw
In reply to Jean Delvare

[Replaced previous maintainer and list with current maintainer and list.]

Quoted 40 lines · Jean Delvare
Quoted 10 lines · Paul Bolle

In v3.2 the Analog Devices ADT75 temperature sensor driver was removed as an IIO driver and support for it was added to the LM75 HWMON driver. But it was apparently overlooked to rename one reference to CONFIG_ADT75 to CONFIG_SENSORS_LM75. Do so now. Use the IS_ENABLED() macro, while we're at it.

---
0) Also untested.

Quoted 8 lines

1) See commits e96f9d89e6213c7630a3323cd0c754e7f2619564 ("hwmon: (lm75) Add support for Analog Devices ADT75") and cdea0bec8d37f2943ae500512b0c178bc76de6e3 ("iio: adc: remove ADT75 driver
- hwmon/lm75 will take over ADT75 support") for the two patches involved in this operation.

 arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This breakage is telling us something about the weird approach taken in this file, methinks.

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2226

Quoted 12 lines
arch/blackfin/mach-bf537/boards/stamp.c +1 -1
index b40b849..9735345 100644
@@ -2221,7 +2221,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 	},
 #endif
 
-#if defined(CONFIG_ADT75) || defined(CONFIG_ADT75_MODULE)
+#if IS_ENABLED(CONFIG_SENSORS_LM75)
 	{
 		I2C_BOARD_INFO("adt75", 0x9),

Unrelated to this patch, but this is very odd, as the ADT75 can't have slave address 0x09. This address is almost exclusively used by battery chargers AFAIK.

Quoted 5 lines

arch/blackfin/mach-bf537/boards/stamp.c static struct i2c_board_info __initdata bfin_i2c_board_info[] = { · line 2227

Quoted 1 line
arch/blackfin/mach-bf537/boards/stamp.c +0 -0
 		.irq = IRQ_PG5,

The patch itself looks good.

After which nothing seems to have happened. Can someone please have a look at this patch?

Paul Bolle