From: Richard Fitzgerald Date: Fri, 2 Aug 2024 15:22:14 +0000 (+0100) Subject: i2c: Fix conditional for substituting empty ACPI functions X-Git-Tag: v6.11-rc3~10^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f17c06c6608ad4ecd2ccf321753fb511812d821b;p=thirdparty%2Fkernel%2Flinux.git i2c: Fix conditional for substituting empty ACPI functions Add IS_ENABLED(CONFIG_I2C) to the conditional around a bunch of ACPI functions. The conditional around these functions depended only on CONFIG_ACPI. But the functions are implemented in I2C core, so are only present if CONFIG_I2C is enabled. Signed-off-by: Richard Fitzgerald Signed-off-by: Wolfram Sang --- diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 07e33bbc9256d..7eedd0c662dad 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -1066,7 +1066,7 @@ static inline int of_i2c_get_board_info(struct device *dev, struct acpi_resource; struct acpi_resource_i2c_serialbus; -#if IS_ENABLED(CONFIG_ACPI) +#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C) bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, struct acpi_resource_i2c_serialbus **i2c); int i2c_acpi_client_count(struct acpi_device *adev);