From patchwork Fri May 20 09:57:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129093 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 BEEC86048B for ; Fri, 20 May 2016 09:58:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B18402793B for ; Fri, 20 May 2016 09:58:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A658427A84; Fri, 20 May 2016 09:58:03 +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 5D9E92793B for ; Fri, 20 May 2016 09:58:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755016AbcETJ6B (ORCPT ); Fri, 20 May 2016 05:58:01 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:9666 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932654AbcETJ6A (ORCPT ); Fri, 20 May 2016 05:58:00 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 18:57:58 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 588C352FBB; Fri, 20 May 2016 18:57:58 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 38B5E8002E; Fri, 20 May 2016 18:57:58 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 31A4C8002D; Fri, 20 May 2016 18:57:58 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAD13911; Fri, 20 May 2016 18:57:58 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211273380" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 18:57:57 +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=Y4O5Qh9WvoqTe7aAQzaoHURYZ/rX6WXK3yQ41NOsZ/I=; b=WzSWIklOtSd7zCmkP0oBjWrUwIDJyqVSrS4T263JOvXsvQRoXvIKs8rTygNQbb/Kdpu1JMHBQQ38DjkjV+5IJZz7o7O+MG8WZ6TxCa+Cq8NBnRdpMeWTpI6jZFSdDcaAt+OPU+JXaEC7mmeH3EprTsvXbruCViUs9v2UULNGv5w= 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 SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 09:57:55 +0000 Message-ID: <87d1ohqcpc.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 30/49] ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() 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:57:55 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0055.jpnprd01.prod.outlook.com (10.165.51.143) To SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) X-MS-Office365-Filtering-Correlation-Id: 36814e7a-35f6-4f27-8062-08d3809537a3 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 2:tPL0RGAVa/1Xn2EI+Jeq6bQnxmwqVtQAFjzgVFUzimsAa003bwmC2Bs/+bnuSwRixmkI9jpZPmryWKR+ADSuL9C7USAUkf45RPBIqNMJ5Va3/SI+/an/2wNXXeHPLmSYAoKwzI2cmyMFOrbVnJO8nx0CmMozwqf0tfNZss9Ft+VkGf5OjRATfVD7gfvOufRN; 3:Q77AWat2d7GOob4AJEf6adv3uEOdpQGfyejw430y2hiIgvPWioAVMz1P+kirQhGaPbVjLGd7DQFaOWD75p8EG7RNBJq9cKOUSUdM1o7vlUMYqS/K3OWet7evwLXhDihK X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1710; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 25:hjSv23/Y2QlSHBvttarN5VHw945H1sIPr9crqh/wO7HVsutlH+rrTwzdoeilDXewhLGoy8FtRSv1P4ZnFyMJ7Wi0yXEE0TtZsz+Z7jFIk2AMMNoeHIv10VgMTb1JRMSCw3jQhMF7z4bfS17VN0M8bYrOeSm90AeEzCpLEQlo2vzwtjVJqGBoDsWXO2ah94jSwNyrNYnQEzYAefKnIERTva0Z0kLmWcRLZ61SGT0LDXLGRL5F19vbB+qliTYnugXEC+FswvMe8njY7jC7ltcMoi6SiwC+sMgcJJ4VjkvzCf+SLUKS4t9krbUAR2Q/9UhvPOzT4KtFBUWpuwx2ovXY0qSMmUxx1MQoRm0X/tyh4Hi9WBjEZ2rWXExkozq/7qsPACI7GzuQZe7pNJuKQH5JisEbrMzQ9t7ehymjbjhdVfQjF3cI1dMm3WT0gdyLJ7tTH/ZMxY+WWyWJIECeVmq6iKWGJFVMeagwZe0O8VkiVgsqIaaa9aEkEq8PAbmwlRjE3Pez9sq92k4fKpacMnC4luRb+TIUcCqe2h0/Pr82DOjdLgOSQ4WuRoI4hBSQiOi4Okq7OneMHA81XKTS4G8fMJu/kBTLOCGN9i1LhxJ2okml8/8cjK08/AEh5HSkF/gV4YisRbx7KgRDBi2AUf6hjJ6IjJkmN379TfRVkv/VhxpBG5XhbJdef/W5w/mab2GX X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 20:6hzfnreeksZmoeo6MLevuMddWsmSO4iLI+bfmWZ/ZDpAJKOtJr/P5WlmUy/KMNPyAOUPrdNaHSldGjo3wgATmAb7cxyw8ehpJbjaP0R9X/LKEL7Td36d9g/dK0gt/JAUChXfCAPvwP3jqBqM8c+BWbCAs7KUYSK600HY8oj3wpVbTYDknL9V6WjW1tVCjQulAqaSSmjDDiXDVVUqz5vcP+g7G/i8zrJnrYc1VJojcByBgKznrxPHJh7QFa+qaI8RBzo+ztibTR8pxXc+NWTgMr8bkN+Zx3LroMlgFZKesMxlkpMdQ7D1hse+/ry3bmnNGK0x1x3dgREp2HqKwAuTlupR/IEasWUCVfdPnK1PukGmyAs17nFTzSdch8LgkzYyLMkkrp37S7UJtfXZsRZd4ofF+taIGi4kaMLRlFOjeusddlnb8BLT9PoQQMhSGhxsZikMlMuSb4tcpAtNulft57DRiZljwm/Ha6El8fdLdXrIqlGn2u9wva0CMVJDTFsw; 4:6aoCmChPuPnDK8YuzdiVcc1QuMG5skRY7uAHld56GxmldnN/blvrPIGf7/CZFlOm/UnS3idHv98GzZ9mjwUmlKnpAYLjaDcZJL5lz4oj8v0Zvj9Y5/U2k7SF+HfOQ3EQ4xP+DxLPcMwDTmPpUoReoCHc6anrHjeAKlL0DwGuFz1yrD6lQIKWhtH5LqYbzuVO+KuRoqddg5Tr488sMEoQHB0CBd/s4uafdQakLCvw8gnXqSwn8azofp7LF6aR+zGpPP4UE75+nm2A+HkBqYfO/4AbCsDyTzaqH/jDxYLTKPoC8iJk2J3Oy2HzNEYBdKuNssG0qsPiX9bjc5gKtSUgwXfaN++u9adtq7F+LCL3SoxP4zuHr+WR4On9GclFOuMt5HVUAFy72dbDr2rDOCVqeA== 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:SG2PR06MB1710; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1710; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(81166006)(66066001)(47776003)(19580395003)(92566002)(42186005)(2906002)(586003)(5004730100002)(3846002)(86362001)(6116002)(19580405001)(4326007)(54356999)(76176999)(50986999)(53416004)(8676002)(46406003)(189998001)(33646002)(110136002)(77096005)(2950100001)(36756003)(50466002)(229853001)(23726003)(83506001)(5008740100001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1710; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 23:5yvofNEQIhPbsAidAZqO4pVYTF4cZpJvxFdS+r+gV17koeLMLP3QajAkJpZWX9k7w0PXUcKq7bhJ8oJrwlPlHyMYLVmCFzIhmfMbulL4jEVc03Be0LvgPG1ICTuqaCZDNcexu7YCwicW8vY+X+u4dV+kcmV5+zoIIOy2LGax5eLCy1joNnOyrqxTMYk+6niqcerf7b365MkzaVqfg+68VgB4kyci2ga6rVsHfZidDNDrJIN2u+tzxTiDbPgerdhwU5tlY4M3PKr2zSh9R4hD3uH1wPwfvwxpedsOjo4QXT00lSHnVNG6oWLNsgeUEBFe2lH2ofN+jthntGzuJ4LqGGgovCHPBXnbNoYqJjdq8T2Y0LP9VceuL2aPLTPjLnQ45/dtok006exTak4KCnj1wxgt2mC6q1ruOqrvq7sVCYdXulEOTtTi+oi/9HquRe2uE+WSeg5c9I1o4yMSwP3bCeMQo6SvoBOIHo7RSo81Rx7kgufnBSyCznKYKESsz+xTC9BCMoXxLd8wvzOwSyNpnHOgH+8cP4qUPGDcuXgcoU4lxBIyyK+O9TZKG9T1nckzKdbBp4OwpZrZGgktFPipxByL6e8v3cUvGiOpMkwHCI+mpr+XqI3YGlVxQEk0v9IUh3Vtoa2EbzzH6fa5W/07NDfdHYtZKzyVXv3RSyJ8u/5abaAVO8Qau9Lzz/DzrebX+hyr7RNi0qpzDfm1Rzzi5t/J86cn/S4RurbSztA/sUuBlbsuR3R7T+XJ0f89V2oWUYQfVxHWdnvkkU41aBerrDWpBLpeWQnGrFCWHanFEdE/cLhi+ceXdEMfI9mdXF6y7QxgGm3RF3sW1uQh0lGW/57LjpWkRgo6lTrzWoXLLxsvcX3818QrbCCH9YoNCnYiHaIBLM1b4Xgq4pUdlolHCQ== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 5:rJzJAfC9C3fepnTQrH8LZBybRcS+7tqJmB21dh5cG3ZLp8nWp09zawXyvIYt8nDkhyEOaukJEbS2NMmFqWYNUDEOLgDexpW262M/2Wj/J9alM1qTQzzVs/A7ki8hIYqCH9jks9l32sahVfcr0pwRDQ==; 24:xKNKMyW1OhQ2jGr5iZ3YfBGmKUVt0yq4dz8guz7fCElJ3AqXPjbiAk0hV2v215s1Tx9ndfs32bicvNFoCi0Hg5DWBP8ifYQIloBuIhkgRx0=; 7:HDSdGplyGAEmthBv3SD7xz5cOYdUCqn/XHPopWxVK0qLgE7+SyvRymNyOxQ6PYDhaqHaSTm3ZI8P9Qyxk6kZF1vj307j79LjPwQ6robJsKFvTqc1AwV401lk1bYh6ZFckMHG5hg5x6u+A+lQVVv5hvCN/0RqhkY4Hms1xS/5Qo3u6oC+KPv7bQsJ5rfRJkYA; 20:T8SGMCzTTmwu0W4F2KunuBlQPMD4lyoblNeeaGN1HA/K6BdadclXK23Om4iOVOXgFO7HyhQzy505HaBogx/qL/8jYTsDly47IY72bIiUaupB0QNqLlzIuPYLS92s5ZuanhxT2DlA8coQ6wEgyzjHNkfZLOcDObfnmz/VKNeVpHc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 09:57:55.4597 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1710 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 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index cde5d50..ec07975 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -211,14 +211,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, if (ret < 0) goto dai_link_of_err; - if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) { - ret = -EINVAL; + ret = asoc_simple_card_canonicalize_dailink(dai_link); + if (ret < 0) goto dai_link_of_err; - } - - /* Assumes platform == cpu */ - if (!dai_link->platform_of_node) - dai_link->platform_of_node = dai_link->cpu_of_node; ret = asoc_simple_card_parse_dailink_name(dev, dai_link); if (ret < 0)