Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp906491rwi; Wed, 19 Oct 2022 04:35:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4jlSruCVUzDHqtWLaHDRAsrN43+GxW8pgUex0qw047eQ9EB+gwFQIE15p+eQDoCa/wkyYn X-Received: by 2002:a17:90b:4a8d:b0:20d:402d:6153 with SMTP id lp13-20020a17090b4a8d00b0020d402d6153mr9519638pjb.44.1666179322692; Wed, 19 Oct 2022 04:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666179322; cv=none; d=google.com; s=arc-20160816; b=FMbEV22sXV5hlK++5onZk7qsZpZfLw1o5KQidBefb2SHJjF2pd7e6V3X2/8oiXLuJp arnST52YDpfC4IjubaC2pJ/9XCGp5xTxdvk4ZyC5gcU4YCg54Eg8eXBSKX61jFG3eUnF H64bAxQmLC7jVm9KYUVzYATIidyJl4sr488Rnu/fWG/fjuaS19Z2ABnOLkyw6xvF5uCz ZpjyMhUhabDheQFDngfQuIG1tZcBwMt4ujd1GE2w6BwMtAl9U1W9msDtK9ppGaoPzpqJ T58f5XY4B1De/QcrmU6mKvnMESr7N+dTSFBaQt/HzJ0IP5QyTZuh2CxekymLUDFi0IlS N9HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qg8KPg1aGV7vsxEijlRYq/bUFOlC3jDh+C01gu5BdMQ=; b=b8iSL7CHtiXuuwEDL0Gx/FVR3QIF5qiNmrehlkGcUCDFm4oyANEpC/6JzlfvOGovha 4eI4CNe6kJ1HzOS+sMPVJcgH/PPFs5ZlgR1gkh4Ke6axaGE2CHFKD3MbWJXhHqR6p8U4 zH/Z0Hvi0r+sYesZu/H6k0Vc9knxdx25ipYnywHm6ACHtWd9jh8RqOxc3G90JCth4mFp +GxoQFAo2qU4CfP0s05AA0I7SVlJrANrn9731GCNuxEWk3xlhooBPqFWZezwL6unLyyY 6Qs1MeFF920/rMOpvC0vKleKksICFzX0bLeNJ/qig3jUk5EJTKGhhQZf+byoD4PxgVCf crUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AOI4Viqz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z17-20020a170902d55100b00182c51058ffsi18645989plf.201.2022.10.19.04.35.09; Wed, 19 Oct 2022 04:35:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AOI4Viqz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233337AbiJSKqk (ORCPT + 99 others); Wed, 19 Oct 2022 06:46:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233297AbiJSKoe (ORCPT ); Wed, 19 Oct 2022 06:44:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B35668E7B5; Wed, 19 Oct 2022 03:20:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 104CAB824D7; Wed, 19 Oct 2022 09:13:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5ECE1C433C1; Wed, 19 Oct 2022 09:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170787; bh=FoAKBoM3BVE06nEwOQj9AKyKByzBVLYrsUm0mfXl8EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AOI4Viqzgb1uOEYMe4Zhg8V7lYI7431EbtRIXIAALVKMAcNUZqBu3oxlzLvK09jNt KYSe/eymQZP+n+XOFGBcHRALnwleVfzk5QLdRovZ2TH6uPXTMC39rFVwohMiGGlnnU VHx/MFcGrzWYcCP6blMw7GVlLanePa+mxeKyRNF4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikhail Rudenko , Mark Brown , Sasha Levin Subject: [PATCH 6.0 752/862] ASoC: sunxi: sun4i-codec: set debugfs_prefix for CPU DAI component Date: Wed, 19 Oct 2022 10:33:59 +0200 Message-Id: <20221019083323.137280072@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mikhail Rudenko [ Upstream commit 717a8ff20f32792d6a94f2883e771482c37d844b ] At present, succesfull probing of H3 Codec results in an error debugfs: Directory '1c22c00.codec' with parent 'H3 Audio Codec' already present! This is caused by a directory name conflict between codec components. Fix it by setting debugfs_prefix for the CPU DAI component. Signed-off-by: Mikhail Rudenko Link: https://lore.kernel.org/r/20220913212256.151799-2-mike.rudenko@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sunxi/sun4i-codec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 830beb38bf15..fdf3165acd70 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1232,6 +1232,9 @@ static const struct snd_soc_component_driver sun8i_a23_codec_codec = { static const struct snd_soc_component_driver sun4i_codec_component = { .name = "sun4i-codec", .legacy_dai_naming = 1, +#ifdef CONFIG_DEBUG_FS + .debugfs_prefix = "cpu", +#endif }; #define SUN4I_CODEC_RATES SNDRV_PCM_RATE_CONTINUOUS -- 2.35.1