Message ID | 87pofyr4qc.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 1C08A603FA for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 27 Apr 2017 02:17:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DDE02860D for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 27 Apr 2017 02:17:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0261F2860F; Thu, 27 Apr 2017 02:17:16 +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 0EA6C28614 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 27 Apr 2017 02:17:16 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C899726719A; Thu, 27 Apr 2017 04:03:47 +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 21DD926718E; Thu, 27 Apr 2017 04:03:46 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 9B2E72671CA for <alsa-devel@alsa-project.org>; Thu, 27 Apr 2017 04:03:01 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 27 Apr 2017 11:02:59 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id D838A53553; Thu, 27 Apr 2017 11:02:59 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.37,256,1488812400"; d="scan'208";a="241944332" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 27 Apr 2017 11:02:59 +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=GAHpMGVlEMJ0AMzTfVyZKjHa1BKd09k9rpJbugAOvJw=; b=PQIYBZiZstjA8i+Y40MSEAmLGgIb6vNNrQ9TzDLVUdVqW76TnZpnd98KRN9PoeS4Bq/dTZ8lRlE8PO/v1Mf7CbMRZhoUdvDc54kc5ysbuAJxWH8IxXrqH38mzZjp5hCZilgoafmFGVJlteRc7scx9qGswruDikswm8HqL3xyWLo= 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 SG2PR06MB0822.apcprd06.prod.outlook.com (10.162.198.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Thu, 27 Apr 2017 02:02:55 +0000 Message-ID: <87pofyr4qc.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> To: Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") In-Reply-To: <871ssesjgn.wl%kuninori.morimoto.gx@renesas.com> References: <871ssesjgn.wl%kuninori.morimoto.gx@renesas.com> Date: Thu, 27 Apr 2017 02:02:55 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0115.jpnprd01.prod.outlook.com (10.167.154.33) To SG2PR06MB0822.apcprd06.prod.outlook.com (10.162.198.148) X-MS-Office365-Filtering-Correlation-Id: 2b33b5c5-2432-4f0f-e7cf-08d48d11856d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SG2PR06MB0822; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0822; 3:8iuGH1GSgDkl2rztRMOiYG+RddYx+b3+k7nIMSbZa6qdsTGKRWi57ejleVu55YQE2mS49smQwqykf0DVpW5zxoHSB5emVl6KXdDRLKjLysRYQ93fWhRKoZqcMuMHepbvwenGIFw/V5TVF2i9l0TAwv0dRUmTwxd9mQ37AbOFxeYIJ+BxqqYGiEQLVLfKuqJrSySCeDBYMoPwXyO+er+EFpLcc2VIcMgCcerdjP0RjB1M+1qXwF6YpNAgAjarjH0pzl+PW4cdh+JLnIbq1u9ucXHKqq/OTwLFywKj/6sE2gwhoR2ALs4xeReJcI4wld5/92Nkw1QdrNwnfUf74BhfGNoWoh9bUmzOm9mg4enSu8g=; 25:dWf6nv/FZCYzVs7p30I1oV45QcNA6ek8jpg/DdmXMiBAI27aAWCCiTL8sYNkCKJyZ+PQ5WEi2PQIneQ/98Y6NJWQoVDjNA16B1P955J3HiP8n4Fe4wJfcNq1jC6z4u17l3jWEFH7teceyBW7C9oIVouHRhzhaTa9cGzSAgA9BTEpD8q1qB8j936xsyXBRDRioLETHrM0rHA4jwBAcEKqRPovIpbBrHkguvxnZFz4XcIU+ShhxLMPsQCIXZ4WcbEkjC0gjySD0B+W7QRSNHnh+5WYQgNaTnktMGwzg2n+4TnljSZhrIhhvaz7gJeOHR/7omJq+LBs8lhsOPnsyh/8EiFGw2tcBW7np7LwD16K7jXRmSdmyKbU7qM4ZnxQwa0ZEKL2QqldCqzjlWnUFq4akDPIiTNehZiahgFCMS+x7PC5FvLRUjfxvVIdc2oMmLP9FUHwd2i0px57R9t5agkh9g== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0822; 31:doR3KUEYOGEifBoDey1SzLt8Ke5v8/yMtb/lqUqxR/ovjPvurgfHZyP0/xE8tleYtJY0yuOLjVkuQErhZ9QVZX7HW770MW0vqnE1HMRI9q67kkZTInNQzazFrYXbyJ82eVFrX4U8aP3FBGkQ0f/2JEU71Ux++BH4W/e0Ft9RN/v1P9pkLutXu4uxO4kpMAopp8uwt8RpcGp6OVXOSq3iwzU0DzACLatOd6oeC+0gWQA41ZBg94C/9F6hynyMq/l+ggqFNOurnL2oNen0ktxfjg==; 20:Ojt7oXyvzoCZWHca/mU4+Wp9lFXPmIsIf4wtwQgLcTK4p51hVgxtvJ0YZFkIj7WVbkNzcr8r2vVS8KRKi2bJMpr3rf7feEcVf9+/ARb7sIcfIEZkxE/r9CeLntF/yLhmAdJkdzqK2zPj8DwoIwdIi8yuY9P3uaJXNWQbVJvqoVcAXqm5PX/Ln9K42MDNo+flEhQo8tC+OQycwoqyjRmGxN//ctmiu3e6lwdGiMxk4wLj7CtGwCc/VUNQ0rQyb2boxbITvUDPQLz071zeyWHwUmaX8aaIdqRKp0hWbiYq/dTSUd+GNUTsoYDRgOfZKyI43hcN6Mic4niiyIDXSXRljhPcvketXT1cXZd3jCmcEJiWJWcfNvbf1blxWPU4sa6rJUeSBFJyO9Hl5cNL2UO93Duh/T/E41HXDzo6558KeUlokaBBcwrSIODBdsW/FlnLY/aRRFkQ+QmBT6whYUMDklnDp9SdIcuLctNeKUIxEpm9Z1QhxpCG52Ml2OIiODb3 X-Microsoft-Antispam-PRVS: <SG2PR06MB0822A64F353E8C79444509F5D4100@SG2PR06MB0822.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:SG2PR06MB0822; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0822; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0822; 4:hEq1vZ+D6vKCHDAevZx5HhJ+1xov/XrwLNB6FpHcbsSj8Oq0pFQTVXv8jAbXhOweh1/jy4hWcc+om96nP05osqr+Rnvk7pNO2BTBRGpE8FzeQ90yjP6l7NlNuMdZ97JFU1poP6SLrUXjIVoHK9HkbGSdQERlFEht0l6c9aMlNF1Bqtbtprnyf60XT/f0IhSOZOPz+hoqufsHS90za3R9niN+i0Bs3CNboCAS15ajG5/Qm/liWD1AlurL9HroCT42VMLg8aDkvxIAqgGiW417Fq1S8FV155of+F5ezDg7uRgUUt/HVYEdmlGL4vJfQXAePFUDXT0rV6z/lJl9BIkgNOMjIfoSTesJg3Vfiu03TQA4elmJd2UGlTTmCB24/kiBCZNy3TBxf16w9jcgj2AxBG8CCRDJPoxNouSqfhMuDEoUvFrH7JlSk1VvOomErkuDX1809t+b0MT2smFD1sy/zqlbFyDxBf0vA7XKdyHcw/5ASNDUrYBTkH5Rw0F6POAEWrYrkA9c4Jmy1QFw8sqAAjOLR4fkIh3MkbdWxauYSdT16eE+QL2mGbjUxIzYq/9e/GzO/pncimYl4r39BFl7msYPFLZOTuK+20UeXKqAy+lvyDkqFvc7vkj5kb7bizvozz02OGnhLtXTFDrxjaLPow2qEgCht0Av1FSSMa92Ud0MBOZR7t32/r/xkh3+x9FpXwouzKfzPRTfRjvn4mJihUB+Fw4bH9oHj4Inm21FsLo= X-Forefront-PRVS: 029097202E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39400400002)(39410400002)(39860400002)(39840400002)(39450400003)(39850400002)(305945005)(7736002)(3846002)(86362001)(2950100002)(47776003)(2906002)(50986999)(6116002)(54906002)(66066001)(8676002)(54356999)(6486002)(81166006)(23726003)(53416004)(76176999)(42186005)(4001350100001)(38730400002)(33646002)(83506001)(46406003)(53936002)(4326008)(230783001)(50466002)(25786009)(189998001)(36756003)(5660300001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0822; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0822; 23:Wx151NToZ2H9d6KtyAs/8Wb6na9h/MOr2jg086OM9?= =?us-ascii?Q?1cd6w6mBcUrPLTKcOrDBcqx6Aa6DKS5nYAjfONph+1UcNyNwKjM2O4ikaFhV?= =?us-ascii?Q?3j46T3Pbt4rlGrGPk2ym5V8Aq4jPQ053BWe90gtHTTjG5TFgjdNNJB6miRXH?= =?us-ascii?Q?+8AyHGCjKkIPKUE4VQUu+KORwExRsyMvUey7SWV/64xY6bNXirq1Dd2LN1Cx?= =?us-ascii?Q?Yaz/A0qk312t+OqmAzn1u49xxSeuXCSH4+iM4bOpvhvWK4NtwgjduEEYGE83?= =?us-ascii?Q?twplK62wPBVaXFrVeO0R6pm6YyG67wyhASXb5KOusIdzep9X0Tv9YuRzegUF?= =?us-ascii?Q?kqtMSjvuYxgSnAsWP9UhOQcCASx5i6/NCs54OE085xbSxVa3YJORtN22lfck?= =?us-ascii?Q?hFh5nkSg5KVGJg7spwcUpUeJqbizJfIAlv0tVdKmSc8NOvGEgV3aj46orC+y?= =?us-ascii?Q?8fcXF2w38u1LC+/eas5fqVA9tNMy0YZ/NuPoWTQ85XVxqMtLEMVseS6iRx8e?= =?us-ascii?Q?Sl+8gpu1WYb88v3TuhXS7YezGdl5Gtnwgvg7E5g0k4w1ZRZRJU6Qy+43JlLL?= =?us-ascii?Q?YyKhqYYgE2I3sHh9JcyFOqij63i5/fx/+enh0ryW48buzgqvFFqXCOqSYYTT?= =?us-ascii?Q?Mz3lw2eNgZHfi5kAblcvAFFrpQKMldqJc3FkcVOvlzTfj+LRFnWUAFsKwRZB?= =?us-ascii?Q?jluJ1zazRhHt1u89qGe4VPMmLa7jO4zFeFq4Jxdw0ViLRyaOAUPHeYHXwfVM?= =?us-ascii?Q?reMRZ2G9DWspgJuBJB0kPU+1zeOMnb84I0jfZjy5yAZSQB1ptIXgj3PUI7ra?= =?us-ascii?Q?2vcRmw9mmhoDvuS/MDx2PwsSFuEKhRHh0iS33i2iDasFutDGnbOtksCI32X0?= =?us-ascii?Q?3AvGJ0aM8YBdALsmYofP9qbv1MLztIKbjWUKNBsArKRm7kn/60Rrzr0vzvWZ?= =?us-ascii?Q?rJZb0jpO9OwS35eyzvCw3NasHj7YPxhyxxLO7wKIb5ShH2FTPFq6D41et1X5?= =?us-ascii?Q?Ipr40ziw2J2DM5dsMJj2KSgnhLcF1/65zRN6VeK2xO5D9OWlE5E1OORCxKKv?= =?us-ascii?Q?oppLT+Iyt4aSrApUJQBw4NHyX3n?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0822; 6:BdnURNLaIJIlcW2WArzf24ftk0yFtHAqGK47RBfHpqCAizUly5PRkktWZ274wgQ92KeZA12DHsqWhXGvke1Td69ZaoBOYiqMSEH90prY0dO7sdld5XTMHIeJeewLK1ElKsrlM+SAV/uX/isI89PnFLLtGjSzcLrBLcfIEzZCVzpDV/Esx9yHq/4U0XJie9SwXZ/nv0+Az4/yKIX9gYZfkjAR8IvAM3iE1MhA42DYyBhSkyZuDshMiaX+Hf57SmS+0kVkWx65KRiKW7qrd2/XjitczrTnrQqKQvjwIfpaO51S5dc0Vfrp5a+4LrOUVM/oC8iEcAAKnRX1TwFDhOhqVVjv7GllbLmR5zjVHuxUGMJ6a2OXUojJsPMuBIlw4Quv+QxqKkPpNlyz2yczmLB4ghFoHX0b5Hn0HMq+0jwmKW8Bdl2AjTQbgFonVXFLIBDoRcBa49kjzg7WsQfupnp9hURN5YVwaVt9AjWSnKPm+Fkp4YMkbplBiDhEQtRilTPa+OgdKxYPlkGHPs7PXx+ELjv9smfjvmW6vVCDBOs6ceo=; 5:aJ27vsq+Ved/cFl5zJCuL4xx0fqpsXDyDEvpsX3Up3jfVaEaIxINLAufrTrcvs+1uLJp2CjImfvc9GL86vFAJdwFo7wz391vC2bnlXhCNiRky/wccxT2KQXelQYa3t2gdngcEXBi6cRu2fUSR6xUaA==; 24:A54gVP7RLmP+UfXKg+qQGPLKq+Y8KwOQhCY9ZnUqT6TNtAgqqY1UP4gQZ0Y6GzX7+eC6sooGDLy2fhpBF2ItM9eDBYMFB8SFHDrAQf+GU0M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0822; 7:RzCa6cJ6PJy1SRz2SMdnMIuaVc4pJs4g5rdbw8QHsx9G5wxpc5EML9i8ucoaMNAsRnQT+9os37iAUoW3APggtjPeGgq6n3Urw7LEmjMzE0NXCpE+UTysvuqg0PxH5nKI+6P/9jeURdnFWbRKTg3feZHXz23dpxkHgzC3Z/0DEl5nQGivzHtgAAj44DSivwtLj4uj7SYaoa8or9SBvti2tcRlDBJepJ3BqwtFRqiZ8Fkfk3qpyZ3cNcDDjHLBNNQspoRNeD5TN2BRunHQytKBwNUm2IEn+RiYMN2c5u076/s79g3avfqyxQg7nx/58cq39NnRoKemVBLcJytE5BUOTQ==; 20:3ybbhWVCnZfPyO+aWnWjZOhSx+yPZu+e7JJS+NggoJIwhemb2Qt/eDVkSG7gRyYpYkZpg2l3CEwAFid4YKCRqBf1K+z+1R9jLi0h1feZ2CkrL3UbEFUyJWPvkjP6ppBxFh2d/F85e5LEOuyKrpinRhTsFbjI0cr+1oYFGnorTuM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2017 02:02:55.2770 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0822 Cc: Linux-DT <devicetree@vger.kernel.org>, Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au> Subject: [alsa-devel] [PATCH v7 6/9][resend] 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
On Wed, Apr 26, 2017 at 9:02 PM, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > Current asoc_simple_card_parse_card_name() detects [prefix]name, > but in generally, we uses "label" for user visible names. > This patch enables it. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > v6 -> v7 > > - don't allow "[prefix]label" > > sound/soc/generic/simple-card-utils.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 343b291..c5ab8ad 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -81,15 +81,21 @@ int asoc_simple_card_set_dailink_name(struct device *dev, int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix) { - char prop[128]; 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; + ret = snd_soc_of_parse_card_name(card, "label"); + if (ret < 0) { + char prop[128]; + + snprintf(prop, sizeof(prop), "%sname", prefix); + ret = snd_soc_of_parse_card_name(card, prop); + if (ret < 0) + return ret; + } if (!card->name && card->dai_link) card->name = card->dai_link->name;