From b8bbd0d907cad739de5e7a30a61453ca2d189f58 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Tue, 31 Jan 2023 09:51:17 +0800 Subject: [PATCH] ASoC: rockchip: multi-dais: Use snd_soc_find_dai_with_mutex Ref: commit 20d9fdee72df ("ASoC: soc-core: add snd_soc_find_dai_with_mutex()") This patch fix WARNING when config enable CONFIG_LOCKDEP: WARNING: CPU: 2 PID: 1 at sound/soc/soc-core.c:816 snd_soc_find_dai+0x120/0x128 Modules linked in: CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.10.66 #121 pstate: 60c00009 (nZCv daif +PAN +UAO -TCO BTYPE=--) pc : snd_soc_find_dai+0x120/0x128 lr : snd_soc_find_dai+0x40/0x128 sp : ffffffc0130eb910 x29: ffffffc0130eb910 x28: 0000000000000000 x27: ffffff80eefdeda0 x26: 0000000000000002 x25: 0000000000000002 x24: ffffff800c20a590 x23: ffffff80ef06a6e8 x22: ffffff800c20a480 x21: ffffff800c1ab680 x20: ffffff80048f8800 x19: ffffffc0130eb970 x18: ffffffc0130e5098 x17: 0000000000000001 x16: ffffff8003d18000 x15: ffffffc012f86000 x14: ffffffc0125e6ce8 x13: 00000000ffffffff x12: ffffffc0129b8d68 x11: 0000000100000003 x10: 00000000ffffffff x9 : 0000000000000000 x8 : ffffffc0dcdb3000 x7 : ffffffc010640fc0 x6 : ffffff8003d18990 x5 : 0000000000000000 x4 : 0000000000000001 x3 : e358acf3a5519911 x2 : 0000000000000001 x1 : ffffffc01246bf58 x0 : 0000000000000000 Call trace: snd_soc_find_dai+0x120/0x128 rockchip_mdais_probe+0x1cc/0x730 platform_drv_probe+0x9c/0xc4 really_probe+0x20c/0x51c driver_probe_device+0x80/0xc0 device_driver_attach+0x7c/0xc0 __driver_attach+0xcc/0x158 bus_for_each_dev+0x80/0xd0 driver_attach+0x28/0x38 bus_add_driver+0x108/0x1e8 driver_register+0x7c/0x118 __platform_driver_register+0x48/0x58 rockchip_mdais_driver_init+0x20/0x30 do_one_initcall+0x9c/0x190 do_initcall_level+0xa4/0xc8 do_initcalls+0x58/0x9c do_basic_setup+0x28/0x38 kernel_init_freeable+0x9c/0xf8 kernel_init+0x18/0x190 ret_from_fork+0x10/0x30 Signed-off-by: Sugar Zhang Change-Id: I16b9642fc1022389e099de0fb98b31201eafe0a1 --- sound/soc/rockchip/rockchip_multi_dais.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rockchip_multi_dais.c b/sound/soc/rockchip/rockchip_multi_dais.c index 88fb11c709bc..7ef37d470831 100644 --- a/sound/soc/rockchip/rockchip_multi_dais.c +++ b/sound/soc/rockchip/rockchip_multi_dais.c @@ -258,7 +258,7 @@ static struct snd_soc_dai *rockchip_mdais_find_dai(struct device_node *np) dai_component.of_node = np; - return snd_soc_find_dai(&dai_component); + return snd_soc_find_dai_with_mutex(&dai_component); } static int mdais_runtime_suspend(struct device *dev)