Skip to content

Commit 9d24eaa

Browse files
rfvirgilgregkh
authored andcommitted
i2c: Use IS_REACHABLE() for substituting empty ACPI functions
commit 71833e7 upstream. Replace IS_ENABLED() with IS_REACHABLE() to substitute empty stubs for: i2c_acpi_get_i2c_resource() i2c_acpi_client_count() i2c_acpi_find_bus_speed() i2c_acpi_new_device_by_fwnode() i2c_adapter *i2c_acpi_find_adapter_by_handle() i2c_acpi_waive_d0_probe() commit f17c06c ("i2c: Fix conditional for substituting empty ACPI functions") partially fixed this conditional to depend on CONFIG_I2C, but used IS_ENABLED(), which is wrong since CONFIG_I2C is tristate. CONFIG_ACPI is boolean but let's also change it to use IS_REACHABLE() to future-proof it against becoming tristate. Somehow despite testing various combinations of CONFIG_I2C and CONFIG_ACPI we missed the combination CONFIG_I2C=m, CONFIG_ACPI=y. Signed-off-by: Richard Fitzgerald <[email protected]> Fixes: f17c06c ("i2c: Fix conditional for substituting empty ACPI functions") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Reviewed-by: Takashi Iwai <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f5e9a22 commit 9d24eaa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/i2c.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ static inline int of_i2c_get_board_info(struct device *dev,
10331033
struct acpi_resource;
10341034
struct acpi_resource_i2c_serialbus;
10351035

1036-
#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C)
1036+
#if IS_REACHABLE(CONFIG_ACPI) && IS_REACHABLE(CONFIG_I2C)
10371037
bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
10381038
struct acpi_resource_i2c_serialbus **i2c);
10391039
int i2c_acpi_client_count(struct acpi_device *adev);

0 commit comments

Comments
 (0)