Hi Greg,

On 04-03-21, 16:17, gregkh@linuxfoundation.org wrote:

This is a note to let you know that I've just added the patch titled

soundwire: debugfs: use controller id instead of link_id

to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: soundwire-debugfs-use-controller-id-instead-of-link_id.patch and it can be found in the queue-5.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

Please drop this patch from stable, it was not tagged to stable and it is reverted

Thanks

...

From 6d5e7af1f6f5924de5dd1ebe97675c2363100878 Mon Sep 17 00:00:00 2001

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org Date: Fri, 15 Jan 2021 16:25:59 +0000 Subject: soundwire: debugfs: use controller id instead of link_id

From: Srinivas Kandagatla srinivas.kandagatla@linaro.org

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 srinivas.kandagatla@linaro.org Link: https://lore.kernel.org/r/20210115162559.20869-1-srinivas.kandagatla@linaro.... Signed-off-by: Vinod Koul vkoul@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

---

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);

}

Patches currently in stable-queue which might be from srinivas.kandagatla@linaro.org are

queue-5.11/asoc-qcom-remove-useless-debug-print.patch queue-5.11/soundwire-debugfs-use-controller-id-instead-of-link_id.patch