From patchwork Mon Apr 17 00:22:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9683383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4489A600F6 for ; Mon, 17 Apr 2017 00:23:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3529A26E98 for ; Mon, 17 Apr 2017 00:23:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 291C227D4A; Mon, 17 Apr 2017 00:23:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73B5226E98 for ; Mon, 17 Apr 2017 00:23:25 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4E20E266C52; Mon, 17 Apr 2017 02:23:24 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 66614266C52; Mon, 17 Apr 2017 02:23:23 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 355D9266BF5 for ; Mon, 17 Apr 2017 02:22:48 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 17 Apr 2017 09:22:46 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 57B284AF6A; Mon, 17 Apr 2017 09:22:45 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 4B13580086; Mon, 17 Apr 2017 09:22:45 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 3F7598002F; Mon, 17 Apr 2017 09:22:45 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id KAW23369; Mon, 17 Apr 2017 09:22:45 +0900 X-IronPort-AV: E=Sophos;i="5.37,210,1488812400"; d="scan'208";a="239851516" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 17 Apr 2017 09:22:44 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=pNIWjIuCM1aJbw9UkQ8wrDJCsYBCATUdRNNPh0KRG10=; b=A7x72wH1SlUDtAl8Lubop09mVB7M75s8zYrif+azSbjRnclVwvE4B1wF06jFMPmrb0+xFNmMK3Bs8nOYifqbSvXXDGXFQZs14Xx3e3AywJFoUj55oSMQGHRt7/IOdOkJ85e5tJiK9011ecQ7SxjQvA7GRqGNVVEAT+lDKL0bulM= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB0823.apcprd06.prod.outlook.com (10.162.198.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Mon, 17 Apr 2017 00:22:40 +0000 Message-ID: <874lxnvqcm.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown , Rob Herring In-Reply-To: <87bmrvvqgs.wl%kuninori.morimoto.gx@renesas.com> References: <87bmrvvqgs.wl%kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 17 Apr 2017 00:22:40 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0008.jpnprd01.prod.outlook.com (10.168.40.146) To SG2PR06MB0823.apcprd06.prod.outlook.com (10.162.198.149) X-MS-Office365-Filtering-Correlation-Id: 4ad9f53b-39c4-4a98-6f39-08d48527dc72 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SG2PR06MB0823; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 3:NNTHdlYHKKrG7WsQxGP/3lJjDP5O/v7OBGpEjiqaF4pfpChdazSNrLiHkisJLPORzpR2SR5TM8fmqinCMherFzFMMgNJCnylccI558ptgC4NDBBA+l03/GMBNUZ+HOemDz5daYUdHg01ov55g+S/glYqY1eq1ikRmWDtRrFJylLl+Zr4glp9jwV55/q8YImJ2HjmcqKhL9Nxq5BGy9jHtSAkogqeQ/szZgi5dBkAf5qXdcDTfvkznZgFSKDRefh5tavbToBsLj2dSw6sggUIreBji0O5RE/H+2KBPUZ9AzLnklUMtFPUGB8/oShWax/B7rrhe4+AxFVwTOEKlojeVNxYp65BaE5wDd0rKZhUiZQ=; 25:lVQY9w56owpXrYtCdogyvDe5ZT0vK921amU2YQy4I3tr77MwndryuJaRsBe23V0bhTzWl3UmtNLndZktygzW7hfFiRMC4Ni5k9yHalblVPB4/zb6oC3kqzty0M+Gt9vnLVZ7akW0HDL1fdx/Xb7ZqfNT8t7Wx5Js/zm+erzT3Oeox4lZm6YlIzXOM48Ekxsv5feGcnldZh3LPgQsM7gNx4Dk70/5X91JaJnmIUVk8M5DIa1KqrQlefJx0tMDHCjjxyYCEC4dPNxDkZRAUp8J9s+DAMtjM3rQ5FFfCNDoe/PMv6qbnry+cRMNQIwcmHyRm/8kgJgQcoC9/MLPpLgAUvt9Skdmg/fVs4s9eLdozs02icuB2qOKq2fhUOPEmS3WlH5+26W28q+jASVEdirngYhU2xlHn2D8+nADPBJnGUDbh5O244LckyW0c2GHy/iG+0lY8LDAEpF8f1SSj52VKA== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 31:RWyBsX7Ch/q0vamfMfz39nyuKpRiIx8ftK14NlBkX4AGxuIZSi9/T+PcFigCeKNpwTYYRJllVe3JfiCo9o/50WuX9XH2Z6m0REngloyENR6TPkkvEJNu6IbJ2Ye+elYYRfTXmiR1GeT+vezGu3lcO4GkCkmCP+/AosVATellzk/lwv0r1PWZcNtX4lOvuCi9PjLl7hi/C9aLyT9bjjYt2HwhzaE79YCToxLvpFUBqnFd3X40+GGqcNdrj6GmIb9vbl53aycwW6buSw9dM6rGEg==; 20:KQ9pGHW6Y19o03tLNir5nC5Zf7jeL7+QdDTyUZ9UBBJAL7Pw8NcYKSvc9EacMukp6dM7jsOMaCOd0iQ18CPHAvuTj2L8xVAbVkd5CIIDNz2PMmDx803uSK91e9+PSZrw9QFX6F8orDKpgOPWMiPM0AjYVcVti/ptZOa0qKn5bx7PKdJMRz6r/82OVEz1LlmVJu1pdBS2PUiX5W8KE8YbKwt3vD45dmqzXYbmNuCnXBPMdQmwmK3bbFZz5z0K73FyyG98MC1JLKgtIKAFnIjGiwSbARdbBDudDGD/rYn+ozy3KqYhbZFuoG4YDKQDnFfq0j+FOqsd9yQLBOKCXLTUQx4kC2sqLKuMEk3gB2pPBOLbNx9VZivEdlpNSaxPFRmlUghNtWBZqfHeOFopRkEooPmlrAFxz8sH2kZJMKcYX3z5oCnd8mGKbS89YyT4bcSS7uRrA5SI0zuCp5LkrlMJiqUCOk2WNF90lTg7u+iOVW7Qeuu3Eu7UxI+yeW2ansVT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(20161123562025)(6072148); SRVR:SG2PR06MB0823; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0823; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 4:EFCA/gTUgkjcUNMnxARx2Tu71CB+YCy2kqiGG6Vxi71xZ0da22XnJXW0lq2w5MslD16mdhjAKxggsrn0Y+exUdny0+TPqGoRn6bA9foKv0lgd/T3sNGcrq7eOEWOcbo+sdRhYoi/W+duYN0lBCeRY12an+WdPFjaW8GQKTNQbfICGDa6uatOhIUzlYmxC6ocNECGBq7CVWmTkfySkGUMzUrvyqZwuGwpfsef/W4lyvZIHcHDEgLnJBhI//LMcEr7g7WxJLkPcXI7YM2xOY8GEI6D2lZPPUPRZ62SQN657Xg5tq74V0CIDK2cpi1asl6D1fDebT409N2o4cT4uf7QBbSsOYI53qZLHWoBEpZRiME1QDj9VSRR12Y5lDDhvmXKugoIn914jqlduNclOcIaN/5ywM+nwcC+UxnCNVAdAHfAkQ/WsjWy1BE56XL0dYGB4hBouJxie7ytszhUgQ/0Z7lUeFuHB4rtmkEzp00gDCmsECI3P1Wjl8N/gbWCnqpS0OLcbBPAyE3HjEkT5mALkkp5kXRyRnPXOUVpH8xLAXSf1il/JHz74m2ufr/KrUqj3xGr9RsO21ew3J/L0yzmdFxn6CbJVr5r2pAddnG5YwkhUahRT5KdK5rXE3oxr0m65+EzSPwFUUJo8exERlUWnCexhNPydXF4DYrUYauQHAiafbwbtZocob2n6iOTcE8IRxuajB6i297yEd6nWLumxVRC9M/dFh8ewgc5cSSEDyA= X-Forefront-PRVS: 02801ACE41 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39400400002)(39850400002)(39450400003)(39860400002)(39840400002)(54906002)(230783001)(47776003)(189998001)(6116002)(46406003)(3846002)(76176999)(305945005)(4001350100001)(23726003)(50466002)(54356999)(50986999)(7736002)(6486002)(2950100002)(81166006)(66066001)(38730400002)(8676002)(33646002)(36756003)(83506001)(86362001)(2906002)(53936002)(4326008)(5660300001)(42186005)(53416004)(25786009)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0823; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0823; 23:u30UIMWE6q09ncAqwgnMvpIvKKooU+gjwK4UHZ7aG?= =?us-ascii?Q?SR4O+M3oZhPEOwDaf6DMObggerdfhx/H/ixpsRjm1Azf8LLgJWTFIOzbFPCx?= =?us-ascii?Q?HX3ApTWV638tRwm5TVemSbobgIW8hzkSwdG3WPv/WWV1IpnOVMiNHuXbn/uW?= =?us-ascii?Q?IRJC+hBP1vfUBD62LOjWhiPAh9cvGrYRjCRiKF9mup1U4DRCDicDDbzLFI29?= =?us-ascii?Q?LWwqvuf7flpF6g3LrFqd5VvuwxP8fZdts9kg0GOHDz7biJsajnjIX9z/RtUf?= =?us-ascii?Q?4hhT87V/zvzjICEu0UOiNppxBFVfAvNyYKFPs2vsb745RIPIHpqCfGA12xwF?= =?us-ascii?Q?f0zdLb4TwK5DDhVVWB/DewaM7CGeHkWwGo2qaPbJHKhStu+2vaRYpKTRhrdO?= =?us-ascii?Q?XS2uF3zZRD7WTRimoWpvELd67bpwT9eryFCQ0Wdw4UelOVGRzHvzFbLZkDdM?= =?us-ascii?Q?Bz6W/QLXCyFvXU67f8V47p61w7P1LVrdIO2LvDddVQJBG+YeEZGskstO2ncQ?= =?us-ascii?Q?AGA+JbYMebTrHNQ4BwbT1O9UIbfmLV5pokq6JpqZ58782OxHRaJ8Pyt8Nt0W?= =?us-ascii?Q?0UXNBvpzMNHemVogm/KA9Q3s5fuCo6mXeAo9900a8XsCdVHW5/GXq/w+I4HJ?= =?us-ascii?Q?6rnoIN4xDMe0Az8tY7RuF88gOVe8qqY+NFiNXOfpNe9AGudD2M/AnWvHQ2ES?= =?us-ascii?Q?r6p7GWcIed71lw1XAqhjgpTbqJKtb27tboI5QbvuUfQcTXZUX0+BjiqGNkKn?= =?us-ascii?Q?6JWskMqmha18gaDKjJ0LNetQbfSFBCxzJVD1Gg9GmLP62uUKAUO0yL2ReyF6?= =?us-ascii?Q?HtxZTU8dpZp/NwbsMUd/B5ulZz1MI44I2BY4nnfGV18QlHXztLk5UTAPuMzV?= =?us-ascii?Q?lIDA2RStJCI+nVHtBAN8/v8osRi6yb6rV5kM7N1hR6H6sOWit6ykE5joV37b?= =?us-ascii?Q?yqTsBo16cQ+Zp8/06bsV06SCjUOIu7KbFVUbOHGRa3l97aObZyNEqTGqfBux?= =?us-ascii?Q?3DTAxNhh5hLEi0h9y377z8+OIt3Wyg/jghNMtWUiO69AVBiKK47DD3NW1ja7?= =?us-ascii?Q?FXjsepHUwp6GuUmCETBsIaB9mSjKE5uLJe4g9JkXO4FuWSnWA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 6:zkufBFcUDH/YjkBw8SBTwP3SJv6Di4Db94H2AGyEdgN0JdTzclSRTfR/VCWngfJThyVR6ZmyaCErwro2Fa0yiuEU3uUpTu6obQK/41penWp4H/oJ2YhSRO7Rk0juJYYINTiVfvJt2RKIDqHeKhpl6aVz0W1YW6WdsBChtSJgUTBNxm1ytQNwN10qMURlvcIUKwsGu0aXKviym2YFGYVdU0rLHduzewTZ18eIOtCxXo/h6qV2S3B7W5gcvd+MeYJb9vxn+LGrgxL1I5wQmrGls3zDuFEgzlsaVUIJugpFOqLiQ6qjvz5niCKBKZ+VBUrdU8FjtMb8ufxlrurXaCGBYlsWv6Sqs6IuRTCTnr3SuUs0GbHoxnvWRgLA17SDhg9UIOqqcP+AyOJg8fI7jPRr/e2IfTUdzad77Lw/oBjWt8ohcC8zctBE1DuIKxCk8KmWdAknJNN74JJ1D1dnb6swQHHK8AlBTpxI708ncDuaGOs=; 5:N2eL5wzJPkKizChxZE0EyC2mAtagj7SfUD1J4k2U0ACWIPW7ojcVj+J+LV4KZ1sHPIoDkO0QsQdQhF5EnJkyU3JzZ2uMVFXO/2N9Ji07A0oy4GJiM5ecnOhSVzhT+DEUL7Hk+H9RvQ9cZi/qPpHasg==; 24:YaWbK0BMPQG7SWmucXWI6yvTgh6qZn/vqYxS1kbzz9atbHbseXIG6CeWtsew+QxJiLmIZmoC42vPolwE59oeeWQOeOw+OCzG5yUFcY+7i1s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 7:RMip5K/EVpfqPY3pOm6TQ77OaTeVX3ZD5EZv4B69jLtfwxyYxheAKZ6LkMAwEARqWoXkmuC6smGcgg+KF93q/6DfGHbn2fMD6tJvJJCWybPwebq4pt512+jMVupLezB+c/KJxdDa1GP9WJ35BurPkHhOcpp/ErEI9kqtzc5KDqyLlih8ObLkkIAkBVJzkWQzHsQnbQVAvsnmzbkbchAzB7DTK91wnew2bTSMF4Sgwt8J1rAvJ1Jw7fyAvuG99c+i1dQ7bHF23i8LkOzDz02rv3YHKgWsTuIVPycwIJBbTy4QvdoiH2vxNCxMMpaXvLxYJHVX2HLDsW3LDacQbdiRjg==; 20:hQ5tiAKTsJHGEKYQgyX1R7s3X7Zs2304WXGv7WeyygUybGVu7IxqidozEtdGDDbJmzA14OaOi872AN6K3j2OXlftOxyysv9P1RChUrfkBIBuEDTzPQQnciAtS1FQD/xfDcZvnhBn8xI5rLZsFT0bAPyXLxEnMuanrMjJ97gM+Vg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2017 00:22:40.9163 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0823 Cc: Linux-DT , Linux-ALSA , Simon Subject: [alsa-devel] [resend][PATCH v5 05/10] ASoC: simple-card-utils: enable "label" on asoc_simple_card_parse_card_name X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current asoc_simple_card_parse_card_name() detect [prefix]name, but in generally, we uses "label" for user visible names. This patch enables [prefix]label too. Signed-off-by: Kuninori Morimoto --- v4 -> v5 - don't exchange simle-xxx-card side sound/soc/generic/simple-card-utils.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 4924575..4dfd9a2 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -82,14 +82,24 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix) { char prop[128]; + char *names[] = { + "label", "name" + }; + int i; int ret; - snprintf(prop, sizeof(prop), "%sname", prefix); + if (!prefix) + prefix = ""; /* Parse the card name from DT */ - ret = snd_soc_of_parse_card_name(card, prop); - if (ret < 0) - return ret; + for (i = 0; i < ARRAY_SIZE(names); i++) { + snprintf(prop, sizeof(prop), "%s%s", prefix, names[i]); + ret = snd_soc_of_parse_card_name(card, prop); + if (ret < 0) + return ret; + if (card->name) + break; + } if (!card->name && card->dai_link) card->name = card->dai_link->name;