From patchwork Fri May 20 09:56:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129083 X-Patchwork-Delegate: geert@linux-m68k.org 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 31F416048B for ; Fri, 20 May 2016 09:56:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 242B81FF6C for ; Fri, 20 May 2016 09:56:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18B372793B; Fri, 20 May 2016 09:56:10 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B23521FF6C for ; Fri, 20 May 2016 09:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755205AbcETJ4J (ORCPT ); Fri, 20 May 2016 05:56:09 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:24263 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755186AbcETJ4I (ORCPT ); Fri, 20 May 2016 05:56:08 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 20 May 2016 18:56:06 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 36D1252F83; Fri, 20 May 2016 18:56:06 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 16D822806E; Fri, 20 May 2016 18:56:06 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 0FF1A2806D; Fri, 20 May 2016 18:56:06 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAH20575; Fri, 20 May 2016 18:56:05 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715224" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 18:56:05 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rRKCVV6NuMhl/9zmNJYDZGqxqb7TsF0hL9C9p0UnLI8=; b=UWBLDBrMZVx6jM6u8dQHvP6CpV1vZJydz3QlDHFgE73BdoX8VmC8zaLCCpYPkuAAenoc+dPcelFsiXjMkatZ7+SWxsvC/EUQAEdJL4jsGRAP9XnxaLtbST6qBTQfOaSOU7S660Qx6AMDmR7pioLAD3sctjYh2tLAE/43/RaMr2g= 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 PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) with Microsoft SMTP Server (TLS) id 15.1.501.7; Fri, 20 May 2016 09:56:03 +0000 Message-ID: <87iny9qcsf.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 26/49] ASoC: simple-card: use asoc_simple_card_parse_card_widgets() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 09:56:03 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0050.jpnprd01.prod.outlook.com (10.164.162.32) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: 9a6f792b-6a03-4a1b-a5b4-08d38094f4ea X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:DYfW24m3nRmv41igagZ3key1ok6zudBzKK95X7zj7CTzFwtc/ONYfE73KImcCzE12GHsdZf7UdUJgldiHyYCsVSTjxrX6m5HutxEdOdozbmnLPV4TIZyocmUO1blJUlY31ZCkmW8EJL02H5Bg7FokXyYYtD1dKV+wuBPGEVbA7m7z1/C9QXgJzomWDY0oZVF; 3:mkAqmGUaOxS+R70kfvcencZ6kuyQms33oSRqJR5ZZF/80cJp3qBL4nd9zhyBLTpXjhdxcUemDW7C+1P4GRJBf6v8zMyUY//eHDdwGNd6r+++NCmEqKkwHNfClJzrldPq X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 25:AIvfpRZK+fZjMTnQMT1RpsKzy1E1dzaB3aIAHiGqVhbwXEnOf0SEpOKmfhKRgotZa2iVNWmOVkp1IEAyycuazwpNDgQVHKX1xXuN8YN/aCzceBbWEapD5pMpHppIYCsNV8aOY3FLZOvEpbKZTxbqZhqYmkhi9xYzwJ0nQNMqCxs+/nVPGRkyhRjTtBSn6kLOfFVhJwTV0kVBs0ud0VRzRgKnWZw4FNTbWPrmbwwBMq+Uefi3vLl1BZRyOzFu4GT4W7ZAkVbh2Md1IaRAajcuE0VghJ0aHAcpvJLXVcaAvt1C4g7GzGntWUnoKH9XR+HvV+uVq/cty3oeMGhN2M9c+C7uAN7zIyMlChx1QwnG+gthQW3S1Tq/KP7OL0Ok+jEjRRoZV61cFGVgAV8dGKdK/iWlbggLzIAzm/20WfkMAHDkh+ygH05PuJC/1bYnfUPINJsHVw+kNjgnNt9iork6VyBXrdSTvL4X+ziJ9kjTlyN6ll5FRxzo2SKxCaBSM9tMtCBE9hi5JV60xQ6wWNduVXUpeU7HzRBOFx8UKW0WxOA2+q1txlx9gMCJo7h44unoz5UYKGHtUHNLwxwsInvXD10Zn1ZDKm9zsulwhefVmfAcCDBHCjhhot1FRu5MUVilRjPtLZJIP1UlcESY1pHHLPIlCL7poE6oxZVJvc4uUEGSlIe2uf57MzDtozhnxK9a2ttHfgd096d/7UsY99pWw7mDi4Wn9IGxTB2DxWunhyU= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:VoEpa+2acGRGXp4exhsCR3sOGYALtvvCargXtnj1QITuIF+k7aMLLQO5Y66yB2M/pDglzuUMUv0zi9cPS9BgvAwU6op2VLWCec+j0FHQAD07W8vNYlgBDABHzSe2T17h2w70kQlHpXLb/kjLfmi56HUIx5GlyX8Vh4xV2hf1cax5Uw47+KOKFLS/Cou+iPA7XnS4lhGGpvTh5mz4KHbSD+8XYdqiUpeHSW1IUK85tKZuq+A1rtHailpNDhfUgB0+mBJ6LLwb5wyMHniEs0O5EwKIv81Z0r7CNkZ/p4/K23zarlx5q/EM1rp0K6WZbCJbukkbtPqR+UmeXLGqKxLdwdv2ii9UTdyhN6GiKYbjKEfd6CTkh/k38cAY7M4ByyKyP7/gHTGP8pAbUXTKvz3aytPcFeJeNZtKVmawJyLQD/N1K4xKxLZ0cNaBYEOM0UzQ6rLt6frL5JY0yJwOY04rnDeEAZGVRJShEZwpDcPmSrxARJScvqk/Pv65Thj5+Q7C; 4:NeL3HqYiVfUswdphjvct2L+gPSB6INi4T3j8yNOXjUlHIc+zkJdi+AlsTgAXXqhjZ+vZdGrJ18qxbaxaRZQkgYA/EdbeoH9X9Zutg8U+qVQeR/dH/4O8t60SIqYeen9K0g5mgdQVc9OJBWEzSWoST6CYzbJtR2aN/EM+34syVxJy5wbgcQ2UrazJQLTumpv9waRqP79+zCPCifvogBkn5bIbP6QnV3z5yYhAaN0XZ52tE3VVi0MhbBGeZwAu+HaFAzO1dSncAyOFZ4b2AAXd8/yfiAlSyXv8GUDNyta8y1fMlrnbU5wdAg6ovcwCWUnRMcBWONFGilmqzi7S+nI6jTg5mDv6wYImYeXL/oiclXhXDFuuYkaOA+vw7uImBANWIBg77Qg65VKbkeUIdRKWIg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:PS1PR06MB1705; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1705; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(53416004)(81166006)(2950100001)(8676002)(66066001)(47776003)(36756003)(76176999)(50986999)(54356999)(42186005)(19580405001)(19580395003)(86362001)(110136002)(189998001)(92566002)(77096005)(83506001)(33646002)(5008740100001)(4326007)(46406003)(5004730100002)(229853001)(50466002)(586003)(2906002)(23726003)(3846002)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1705; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 23:3KEi8BAuOho3fAg3MPHypxnrpt2cJWjFHrwcQ6wg0n+kfHXYAnBKzMrqH2obewX+DNMVs8iejvs0qZuipaFYnE9U+mWfSJj4bFpilfU2iuw78eJxEomrWcarnpzikr4wguBai3A9Mz/x7m5UcXBm6uLJuA5q9dkmoV2+a7tJ2emh7y4MGSwtY84JW3Zc+owPOZ/nqqw9mt7Ate/mH4xoxxX5hlAgua7n++7Z/qIUHCvYCMpjhhBnx3uoYSNGSNtBhb2fnzf+zqP0rvkIppRHPqpHlnD/oM6ShifXtolBECnlu/DWgccCv466yb6Axn2YfedGcd66NFDOEj+jnQqnyUbY7gp4pCbCSPSViZQVt7x1q/mu1XR6AJz3EoLxZ3nTmmapUHY17cGCmGrRN57QpaWiXfBwIwVoqvwdNEWtjg0QKRE4VbuBZ5L9m+btN/mArEB3cNtAhhk2iFQUs5Ar6VaHk1KF0xuw9AfC6/lwNYROO39Xf7SBKWQryU/bSq777DRqGl6YluoLcGS06Ws3wXsRUXKXHENCizCN0eoRN/InsdKN5uzAL5P/8LS7hSoX8D5rsmrOq1I69aPti/eBnPTmYSWohqd7XlKVk11+hWHoF0ddRjgSkxgPC66vJ8vD+kaz5rrJ2b/W1HxG4GCqoS6S/v+U58wQvvTwpGOVQ78GRtr9pt/fkObFhkb+zMLXnS9fPYF9o4VCM15OrChTSJ3xO0pgfOixmpBtwyfJhzxNAFANGxt+3ho0xCDd/5wLcxI58+kanikXguR5WGCWl9acF4btu5BYXW7XOgE3disZ6SQRlxKwiDW3XDNsGcrVnB4hRgXNP0CSqklfHTPTQa8szmkp+PacRzQEN7RimYJLFkyI1c5HbrpFwYuWTPQ3a+gsWTZTcKS6L+J7nXtGZA== X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 5:NWKixkechTDMQLp1WYhMwp2OZj5D/8zVDgIXDMo8Ijoo2LejFPaWnFAnURy46jU9h6/XH+REcIbaJCmxnvLUldagwGprtdtMsScfTNA5iaXpsq8mhJNEdd4PYl2KuTqFRyexrpLy4MMyGwUvec+dYA==; 24:U2LISNwOWkbdipCD2lrbN+c+ycIUmcVuI6eA8HbvA/cne6eqr0GhGNWEhbJ5NSZ+NNh7ai40c9ok1dGMpPd0Bmvae4Wyp8kjcf3W/XAqRWc=; 7:OlW99U/2sAQtGa8eW3Gk1MEgHUGpNeTJ7raNsGwsAG12bYOhrL0YwtAHxES4cX3NalbqFBCK275BaaoUcw/oYkOza9VJujZCWke5RGpjmts4swXdqcIciRplEONAqPg26ajhRyUK7s06P2jQTJVQzrWfyzCxA/6ZNEOYI3m0B7jsQKbru2WJ6BRtonYpBsgr; 20:hOCMk5+xB3pHx4NnH/XDZAb7N1aYMWieXUaxN5bIdfyKwfV/3M19SvG586HMctNfon4vHbzzEXovSpbxHYKV9SysMse17PB5j1lDAcDknl5Tqc9y+CHxYa29PjzarQlnMYDRLT+HR4D2Skuyzncz2bYFOX8D8RtcXgvkcG98hLw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 09:56:03.7374 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1705 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 5b2559a..ab97a07 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -353,14 +353,6 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (!node) return -EINVAL; - /* The off-codec widgets */ - if (of_property_read_bool(node, "simple-audio-card,widgets")) { - ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card, - "simple-audio-card,widgets"); - if (ret) - return ret; - } - /* Factor to mclk, used in hw_params() */ ret = of_property_read_u32(node, "simple-audio-card,mclk-fs", &val); if (ret == 0) @@ -400,6 +392,10 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (priv->gpio_mic_det == -EPROBE_DEFER) return -EPROBE_DEFER; + ret = asoc_simple_card_parse_card_widgets(card, PREFIX); + if (ret) + return ret; + ret = asoc_simple_card_parse_card_route(card, PREFIX); if (ret) return ret;