From: Greg Kroah-Hartman Date: Fri, 5 Mar 2021 07:01:23 +0000 (+0100) Subject: drop soundwire patch from 5.10 and 5.11 X-Git-Tag: v4.4.260~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b457cace958df8642950cd5a9e9507d7b07d168d;p=thirdparty%2Fkernel%2Fstable-queue.git drop soundwire patch from 5.10 and 5.11 --- diff --git a/queue-5.10/series b/queue-5.10/series index 5169b3cbc5e..c52b5b05837 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -32,7 +32,6 @@ net-fix-dev_ifsioc_locked-race-condition.patch dt-bindings-ethernet-controller-fix-fixed-link-specification.patch dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch asoc-qcom-remove-useless-debug-print.patch -soundwire-debugfs-use-controller-id-instead-of-link_id.patch rsi-fix-tx-eapol-packet-handling-against-iwlwifi-ap.patch rsi-move-card-interrupt-handling-to-rx-thread.patch rcu-nocb-trigger-self-ipi-on-late-deferred-wake-up-b.patch diff --git a/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_id.patch b/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_id.patch deleted file mode 100644 index 89c83ddaec9..00000000000 --- a/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_id.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6d5e7af1f6f5924de5dd1ebe97675c2363100878 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla -Date: Fri, 15 Jan 2021 16:25:59 +0000 -Subject: soundwire: debugfs: use controller id instead of link_id - -From: Srinivas Kandagatla - -commit 6d5e7af1f6f5924de5dd1ebe97675c2363100878 upstream. - -link_id can be zero and if we have multiple controller instances -in a system like Qualcomm debugfs will end-up with duplicate namespace -resulting in incorrect debugfs entries. - -Using id should give a unique debugfs directory entry and should fix below -warning too. -"debugfs: Directory 'master-0' with parent 'soundwire' already present!" - -Fixes: bf03473d5bcc ("soundwire: add debugfs support") -Signed-off-by: Srinivas Kandagatla -Link: https://lore.kernel.org/r/20210115162559.20869-1-srinivas.kandagatla@linaro.org -Signed-off-by: Vinod Koul -Signed-off-by: Greg Kroah-Hartman ---- - drivers/soundwire/debugfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/soundwire/debugfs.c -+++ b/drivers/soundwire/debugfs.c -@@ -19,7 +19,7 @@ void sdw_bus_debugfs_init(struct sdw_bus - return; - - /* create the debugfs master-N */ -- snprintf(name, sizeof(name), "master-%d", bus->link_id); -+ snprintf(name, sizeof(name), "master-%d", bus->id); - bus->debugfs = debugfs_create_dir(name, sdw_debugfs_root); - } - diff --git a/queue-5.11/series b/queue-5.11/series index ed52f706977..104b8f10e96 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -34,7 +34,6 @@ net-fix-dev_ifsioc_locked-race-condition.patch dt-bindings-ethernet-controller-fix-fixed-link-specification.patch dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch asoc-qcom-remove-useless-debug-print.patch -soundwire-debugfs-use-controller-id-instead-of-link_id.patch ath10k-prevent-deinitializing-napi-twice.patch edac-amd64-do-not-load-on-family-0x15-model-0x13.patch staging-fwserial-fix-error-handling-in-fwserial_crea.patch diff --git a/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_id.patch b/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_id.patch deleted file mode 100644 index 89c83ddaec9..00000000000 --- a/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_id.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6d5e7af1f6f5924de5dd1ebe97675c2363100878 Mon Sep 17 00:00:00 2001 -From: Srinivas Kandagatla -Date: Fri, 15 Jan 2021 16:25:59 +0000 -Subject: soundwire: debugfs: use controller id instead of link_id - -From: Srinivas Kandagatla - -commit 6d5e7af1f6f5924de5dd1ebe97675c2363100878 upstream. - -link_id can be zero and if we have multiple controller instances -in a system like Qualcomm debugfs will end-up with duplicate namespace -resulting in incorrect debugfs entries. - -Using id should give a unique debugfs directory entry and should fix below -warning too. -"debugfs: Directory 'master-0' with parent 'soundwire' already present!" - -Fixes: bf03473d5bcc ("soundwire: add debugfs support") -Signed-off-by: Srinivas Kandagatla -Link: https://lore.kernel.org/r/20210115162559.20869-1-srinivas.kandagatla@linaro.org -Signed-off-by: Vinod Koul -Signed-off-by: Greg Kroah-Hartman ---- - drivers/soundwire/debugfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/soundwire/debugfs.c -+++ b/drivers/soundwire/debugfs.c -@@ -19,7 +19,7 @@ void sdw_bus_debugfs_init(struct sdw_bus - return; - - /* create the debugfs master-N */ -- snprintf(name, sizeof(name), "master-%d", bus->link_id); -+ snprintf(name, sizeof(name), "master-%d", bus->id); - bus->debugfs = debugfs_create_dir(name, sdw_debugfs_root); - } -