From 05a886ddfd9693c470abef93a991fe7be3449267 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 2 Mar 2021 14:58:37 -0500 Subject: [PATCH] Drop soundwire-debugfs-use-controller-id-instead-of-link_.patch Signed-off-by: Sasha Levin --- queue-5.10/series | 1 - ...s-use-controller-id-instead-of-link_.patch | 42 ------------------- queue-5.11/series | 1 - ...s-use-controller-id-instead-of-link_.patch | 42 ------------------- 4 files changed, 86 deletions(-) delete mode 100644 queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_.patch delete mode 100644 queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_.patch diff --git a/queue-5.10/series b/queue-5.10/series index 721637779d3..535732fb2b3 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -392,7 +392,6 @@ phy-rockchip-emmc-emmc_phy_init-always-return-0.patch phy-cadence-torrent-fix-error-code-in-cdns_torrent_p.patch misc-eeprom_93xx46-add-module-alias-to-avoid-breakin.patch pci-rcar-always-allocate-msi-addresses-in-32bit-spac.patch -soundwire-debugfs-use-controller-id-instead-of-link_.patch soundwire-cadence-fix-ack-nak-handling.patch pwm-rockchip-enable-apb-clock-during-register-access.patch pwm-rockchip-rockchip_pwm_probe-remove-superfluous-c.patch diff --git a/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_.patch b/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_.patch deleted file mode 100644 index 590f9077a23..00000000000 --- a/queue-5.10/soundwire-debugfs-use-controller-id-instead-of-link_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7abd55a43f186fd1f58fc0ec99dda57c9d66e1ef Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Jan 2021 16:25:59 +0000 -Subject: soundwire: debugfs: use controller id instead of link_id - -From: Srinivas Kandagatla - -[ Upstream commit 6d5e7af1f6f5924de5dd1ebe97675c2363100878 ] - -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: Sasha Levin ---- - drivers/soundwire/debugfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c -index b6cad0d59b7b9..5f9efa42bb25b 100644 ---- a/drivers/soundwire/debugfs.c -+++ b/drivers/soundwire/debugfs.c -@@ -19,7 +19,7 @@ void sdw_bus_debugfs_init(struct sdw_bus *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); - } - --- -2.27.0 - diff --git a/queue-5.11/series b/queue-5.11/series index a742f2eb5f9..7b77b097235 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -477,7 +477,6 @@ phy-rockchip-emmc-emmc_phy_init-always-return-0.patch phy-cadence-torrent-fix-error-code-in-cdns_torrent_p.patch misc-eeprom_93xx46-add-module-alias-to-avoid-breakin.patch pci-rcar-always-allocate-msi-addresses-in-32bit-spac.patch -soundwire-debugfs-use-controller-id-instead-of-link_.patch soundwire-cadence-fix-ack-nak-handling.patch pwm-rockchip-enable-apb-clock-during-register-access.patch pwm-rockchip-rockchip_pwm_probe-remove-superfluous-c.patch diff --git a/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_.patch b/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_.patch deleted file mode 100644 index a4eaee3cf2e..00000000000 --- a/queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eeb2e7e71fde89978f8fb0c1e38322dae2c6cf91 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Jan 2021 16:25:59 +0000 -Subject: soundwire: debugfs: use controller id instead of link_id - -From: Srinivas Kandagatla - -[ Upstream commit 6d5e7af1f6f5924de5dd1ebe97675c2363100878 ] - -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: Sasha Levin ---- - drivers/soundwire/debugfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c -index b6cad0d59b7b9..5f9efa42bb25b 100644 ---- a/drivers/soundwire/debugfs.c -+++ b/drivers/soundwire/debugfs.c -@@ -19,7 +19,7 @@ void sdw_bus_debugfs_init(struct sdw_bus *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); - } - --- -2.27.0 - -- 2.47.3