From: Greg Kroah-Hartman Date: Thu, 5 Sep 2024 08:31:24 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.109~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc87e10e9ef6482f1e9dffc9f491a063d4e541b8;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: i2c-use-is_reachable-for-substituting-empty-acpi-functions.patch --- diff --git a/queue-6.1/i2c-use-is_reachable-for-substituting-empty-acpi-functions.patch b/queue-6.1/i2c-use-is_reachable-for-substituting-empty-acpi-functions.patch new file mode 100644 index 00000000000..772abbd30d5 --- /dev/null +++ b/queue-6.1/i2c-use-is_reachable-for-substituting-empty-acpi-functions.patch @@ -0,0 +1,49 @@ +From 71833e79a42178d8a50b5081c98c78ace9325628 Mon Sep 17 00:00:00 2001 +From: Richard Fitzgerald +Date: Wed, 14 Aug 2024 13:16:49 +0100 +Subject: i2c: Use IS_REACHABLE() for substituting empty ACPI functions + +From: Richard Fitzgerald + +commit 71833e79a42178d8a50b5081c98c78ace9325628 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 f17c06c6608a ("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 +Fixes: f17c06c6608a ("i2c: Fix conditional for substituting empty ACPI functions") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202408141333.gYnaitcV-lkp@intel.com/ +Reviewed-by: Takashi Iwai +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/i2c.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/i2c.h ++++ b/include/linux/i2c.h +@@ -1035,7 +1035,7 @@ static inline int of_i2c_get_board_info( + struct acpi_resource; + struct acpi_resource_i2c_serialbus; + +-#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C) ++#if IS_REACHABLE(CONFIG_ACPI) && IS_REACHABLE(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); diff --git a/queue-6.1/series b/queue-6.1/series index 0ba23792d12..2c7d3133b72 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -101,3 +101,4 @@ ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch udf-limit-file-size-to-4tb.patch ext4-reject-casefold-inode-flag-without-casefold-feature.patch ext4-handle-redirtying-in-ext4_bio_write_page.patch +i2c-use-is_reachable-for-substituting-empty-acpi-functions.patch