Skip to contentSkip to conversation

mfd: Drop obsolete dependencies on COMPILE_TEST

PATCH Applied Jean Delvare 2 participants 2 messages Nov 22, 2022 – Dec 8, 2022 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: Drop obsolete dependencies on COMPILE_TEST

Since commit 0166dc11be91 ("of: make CONFIG_OF user selectable"), it is possible to test-build any driver which depends on OF on any architecture by explicitly selecting OF. Therefore depending on COMPILE_TEST as an alternative is no longer needed.

It is actually better to always build such drivers with OF enabled, so that the test builds are closer to how each driver will actually be built on its intended target. Building them without OF may not test much as the compiler will optimize out potentially large parts of the code. In the worst case, this could even pop false positive warnings. Dropping COMPILE_TEST here improves the quality of our testing and avoids wasting time on non-existent issues.

As a minor optimization, this also lets us drop of_match_ptr(), as we now know what it will resolve to, we might as well save cpp some work.

Cc Lee Jones <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
Cc Chanwoo Choi <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Bartlomiej Zolnierkiewicz <[email protected]>
Cc Luca Ceresoli <[email protected]>
Cc "Jonathan Neuschäfer" <[email protected]>
---
 drivers/mfd/Kconfig          |   16 ++++++++--------
 drivers/mfd/motorola-cpcap.c |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/mfd/Kconfig +8 -8
@@ -794,7 +794,7 @@ config MFD_MAX14577
 config MFD_MAX77620
 	bool "Maxim Semiconductor MAX77620 and MAX20024 PMIC Support"
 	depends on I2C=y
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	select REGMAP_IRQ
@@ -809,7 +809,7 @@ config MFD_MAX77620
 config MFD_MAX77650
 	tristate "Maxim MAX77650/77651 PMIC Support"
 	depends on I2C
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	select REGMAP_IRQ
@@ -824,7 +824,7 @@ config MFD_MAX77650
 config MFD_MAX77686
 	tristate "Maxim Semiconductor MAX77686/802 PMIC Support"
 	depends on I2C
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	select REGMAP_IRQ
@@ -853,7 +853,7 @@ config MFD_MAX77693
 config MFD_MAX77714
 	tristate "Maxim Semiconductor MAX77714 PMIC Support"
 	depends on I2C
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	help
@@ -973,7 +973,7 @@ config EZX_PCAP
 config MFD_CPCAP
 	tristate "Support for Motorola CPCAP"
 	depends on SPI
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_SPI
 	select REGMAP_IRQ
@@ -998,7 +998,7 @@ config MFD_VIPERBOARD
 
 config MFD_NTXEC
 	tristate "Netronix embedded controller (EC)"
-	depends on OF || COMPILE_TEST
+	depends on OF
 	depends on I2C
 	select REGMAP_I2C
 	select MFD_CORE
@@ -1172,7 +1172,7 @@ config MFD_RN5T618
 config MFD_SEC_CORE
 	tristate "Samsung Electronics PMIC Series Support"
 	depends on I2C=y
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	select REGMAP_IRQ
@@ -2018,7 +2018,7 @@ config MFD_STPMIC1
 config MFD_STMFX
 	tristate "Support for STMicroelectronics Multi-Function eXpander (STMFX)"
 	depends on I2C
-	depends on OF || COMPILE_TEST
+	depends on OF
 	select MFD_CORE
 	select REGMAP_I2C
 	help
drivers/mfd/motorola-cpcap.c +1 -1
@@ -296,7 +296,7 @@ static int cpcap_probe(struct spi_device
 	struct cpcap_ddata *cpcap;
 	int ret;
 
-	match = of_match_device(of_match_ptr(cpcap_of_match), &spi->dev);
+	match = of_match_device(cpcap_of_match, &spi->dev);
 	if (!match)
 		return -ENODEV;
 
Signature · 2 lines
Jean Delvare
SUSE L3 Support
maintainer Applied
#1 lore raw
Quoted 24 lines · Jean Delvare

Since commit 0166dc11be91 ("of: make CONFIG_OF user selectable"), it is possible to test-build any driver which depends on OF on any architecture by explicitly selecting OF. Therefore depending on COMPILE_TEST as an alternative is no longer needed.

It is actually better to always build such drivers with OF enabled, so that the test builds are closer to how each driver will actually be built on its intended target. Building them without OF may not test much as the compiler will optimize out potentially large parts of the code. In the worst case, this could even pop false positive warnings. Dropping COMPILE_TEST here improves the quality of our testing and avoids wasting time on non-existent issues.

As a minor optimization, this also lets us drop of_match_ptr(), as we now know what it will resolve to, we might as well save cpp some work.

Cc Lee Jones <[email protected]>
Cc Bartosz Golaszewski <[email protected]>
Cc Chanwoo Choi <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Bartlomiej Zolnierkiewicz <[email protected]>
Cc Luca Ceresoli <[email protected]>
Cc "Jonathan Neuschäfer" <[email protected]>
Quoted 4 lines
---
 drivers/mfd/Kconfig          |   16 ++++++++--------
 drivers/mfd/motorola-cpcap.c |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

Applied, thanks.

Signature · 1 line
Lee Jones [李琼斯]