From: Sasha Levin Date: Fri, 4 Oct 2024 23:08:22 +0000 (-0400) Subject: Drop cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch X-Git-Tag: v6.6.55~151 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d99c9a696e5a07834774ef5a4064d9512ba01ce4;p=thirdparty%2Fkernel%2Fstable-queue.git Drop cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch b/queue-6.1/cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch deleted file mode 100644 index 40f14900606..00000000000 --- a/queue-6.1/cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 52f534c64a4fe635422e2f63ac72dcbecaf10d0e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 20 Aug 2024 11:40:22 +0200 -Subject: cpuidle: riscv-sbi: Use scoped device node handling to fix missing - of_node_put - -From: Krzysztof Kozlowski - -[ Upstream commit a309320ddbac6b1583224fcb6bacd424bcf8637f ] - -Two return statements in sbi_cpuidle_dt_init_states() did not drop the -OF node reference count. Solve the issue and simplify entire error -handling with scoped/cleanup.h. - -Fixes: 6abf32f1d9c5 ("cpuidle: Add RISC-V SBI CPU idle driver") -Cc: All applicable -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Anup Patel -Link: https://patch.msgid.link/20240820094023.61155-1-krzysztof.kozlowski@linaro.org -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Sasha Levin ---- - drivers/cpuidle/cpuidle-riscv-sbi.c | 21 +++++++-------------- - 1 file changed, 7 insertions(+), 14 deletions(-) - -diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c -index 8a185116b82ee..6d73ded6fa39a 100644 ---- a/drivers/cpuidle/cpuidle-riscv-sbi.c -+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c -@@ -8,6 +8,7 @@ - - #define pr_fmt(fmt) "cpuidle-riscv-sbi: " fmt - -+#include - #include - #include - #include -@@ -266,19 +267,16 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, - { - struct sbi_cpuidle_data *data = per_cpu_ptr(&sbi_cpuidle_data, cpu); - struct device_node *state_node; -- struct device_node *cpu_node; - u32 *states; - int i, ret; - -- cpu_node = of_cpu_device_node_get(cpu); -+ struct device_node *cpu_node __free(device_node) = of_cpu_device_node_get(cpu); - if (!cpu_node) - return -ENODEV; - - states = devm_kcalloc(dev, state_count, sizeof(*states), GFP_KERNEL); -- if (!states) { -- ret = -ENOMEM; -- goto fail; -- } -+ if (!states) -+ return -ENOMEM; - - /* Parse SBI specific details from state DT nodes */ - for (i = 1; i < state_count; i++) { -@@ -294,10 +292,8 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, - - pr_debug("sbi-state %#x index %d\n", states[i], i); - } -- if (i != state_count) { -- ret = -ENODEV; -- goto fail; -- } -+ if (i != state_count) -+ return -ENODEV; - - /* Initialize optional data, used for the hierarchical topology. */ - ret = sbi_dt_cpu_init_topology(drv, data, state_count, cpu); -@@ -307,10 +303,7 @@ static int sbi_cpuidle_dt_init_states(struct device *dev, - /* Store states in the per-cpu struct. */ - data->states = states; - --fail: -- of_node_put(cpu_node); -- -- return ret; -+ return 0; - } - - static void sbi_cpuidle_deinit_cpu(int cpu) --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index ea90ad592d0..f4cc6deb186 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -360,7 +360,6 @@ pps-add-an-error-check-in-parport_attach.patch x86-idtentry-incorporate-definitions-declarations-of.patch x86-entry-remove-unwanted-instrumentation-in-common_.patch cpuidle-adjust-includes-to-remove-of_device.h.patch -cpuidle-riscv-sbi-use-scoped-device-node-handling-to.patch mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch lib-xarray-introduce-a-new-helper-xas_get_order.patch mm-filemap-optimize-filemap-folio-adding.patch