From patchwork Mon Jan 11 13:05:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 360596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56A8BC433DB for ; Mon, 11 Jan 2021 13:09:13 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C8FCF22ADF for ; Mon, 11 Jan 2021 13:09:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8FCF22ADF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 5ADBC1710; Mon, 11 Jan 2021 14:08:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5ADBC1710 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1610370551; bh=5wESsXurGi2N/1Z5Il5HLD9RFyiIUm8+EHbYvEfZN4U=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Ajjmp2bBJJwovP7xO2P/sh4TVrGTA1LcpwvvGWdguMpeFXzd6h58ChvA2eecf2dyq Qg8JIl866/lV8uj6JsbbNYmALhzYwZiZ97qm6KWphuHWJ4Y1M0Zjky3YQFJfgduZQb xeMHIQq4RI4AI09vE81ndo7ytCBJEa4o/c7aO6ls= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8262AF804D6; Mon, 11 Jan 2021 14:07:28 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 14078F804C2; Mon, 11 Jan 2021 14:06:49 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 83F26F8026D for ; Mon, 11 Jan 2021 14:06:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 83F26F8026D Received: from [123.114.32.120] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kywuA-0001Ym-3l; Mon, 11 Jan 2021 13:06:43 +0000 From: Hui Wang To: alsa-devel@alsa-project.org, tiwai@suse.de, perex@perex.cz, kai.vehmanen@linux.intel.com Subject: [RFC][PATCH v4 2/4] alsa: jack: adjust jack_kctl debugfs folder's name Date: Mon, 11 Jan 2021 21:05:55 +0800 Message-Id: <20210111130557.90208-3-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210111130557.90208-1-hui.wang@canonical.com> References: <20210111130557.90208-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" We used jack_kctl->kctl.id as the folder's name, but there are some characters which are not suitable for foler's name, for example, a HDMI/DP audio jack id contains '/', ',', '=' and ' ', this patch will remove them from folder's name. Before applying patch, the folders look like: 'HDMI!DP,pcm=3 Jack' 'Headphone Jack' 'Mic Jack' After applying the patch, the folders look like: HDMIDPpcm3Jack HeadphoneJack MicJack Signed-off-by: Hui Wang --- sound/core/jack.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sound/core/jack.c b/sound/core/jack.c index 0092cb6b5b79..e1d1b26f3a5e 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -243,18 +243,36 @@ static const struct file_operations jackin_inject_fops = { .llseek = default_llseek, }; +/* The substrings in the jack's name but not suitable for folder's name */ +static const char * const dropped_chars[] = { + "/", "=", ",", " ", +}; + +static char *strremove(char *s, const char *c) +{ + char *p; + + while ((p = strstr(s, c))) { + *p = '\0'; + strcat(s, p+strlen(c)); + } + + return s; +} + static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack, struct snd_jack_kctl *jack_kctl) { char *tname; + int i; - /* the folder's name can't contains '/', need to replace it with '!' - * as lib/kobject.c does - */ tname = kstrdup(jack_kctl->kctl->id.name, GFP_KERNEL); if (!tname) return -ENOMEM; - strreplace(tname, '/', '!'); + + for (i = 0; i < ARRAY_SIZE(dropped_chars); i++) + tname = strremove(tname, dropped_chars[i]); + jack_kctl->jack_debugfs_root = debugfs_create_dir(tname, jack->card->debugfs_root); kfree(tname);