From patchwork Fri May 20 10:05:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129131 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 874836048B for ; Fri, 20 May 2016 10:05:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 779E11FFC9 for ; Fri, 20 May 2016 10:05:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6890727BF1; Fri, 20 May 2016 10:05:40 +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 D42141FFC9 for ; Fri, 20 May 2016 10:05:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753080AbcETKFj (ORCPT ); Fri, 20 May 2016 06:05:39 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:55790 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752668AbcETKFi (ORCPT ); Fri, 20 May 2016 06:05:38 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 20 May 2016 19:05:37 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3FB925358A; Fri, 20 May 2016 19:05:37 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 40DE12806D; Fri, 20 May 2016 19:05:37 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 3B6232806F; Fri, 20 May 2016 19:05:37 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id VAB26235; Fri, 20 May 2016 19:05:37 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211275538" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:05:35 +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=vgQLQ5upI3jTT690JCAUcBtxmvvSyQQEPDPla2211Qo=; b=nJJbITVl8+bjlsszdTnZEKBhs/2OItyJwbzuiNxWR44uhd/HfFdzSa/WteQz0F4HXusQeJ29j/SZQ7SqG+mvUnZHAVDuIgS4zW3k3nWoNps4BZZeKnfFSZHFOu6pdNCBYlkAvOJYNyZgvBk6Kp+yD+rOeK+i0tcOs3WTnBaZ6Us= 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 10:05:32 +0000 Message-ID: <87shxdoxs6.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 44/49] ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() 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 10:05:32 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0016.apcprd06.prod.outlook.com (10.164.91.26) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: 91d6dfdf-4ae7-48c5-359a-08d380964803 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:lu7GHGTcrSAVTWIO8O9rRhRuiVASKU+v1sBBA+lOQbeuUMn83E3F3iA0jHsIV+OHA5Elp3LjLvuOcqagBoFjRY5BObmYSaxKD+86gmFkK70LGb1HXB55SK1kCJyL0JZLKaJW7MhIXeasZXgTvNAEgKzJwKxRt+SBCqGN1FJA/t9zUa/8Q5orPcPAYFy8I7wo; 3:n5ZJXHTnzowXwfmfxUlZoBqvVa8n9BMrkuJzVkmDC5YVEzEln+KRLfpv4E0TFjc+DDsfYWrHnYiMeI8ipNhS9PkcrW5b0QjbvEA5hBpd5vmbagGWVuODbuTswzO3BkIx; 25:ocA+/8vEMPWdI2XLwDU9G6hS0xw/7ktncBgCYMxKyK2EpxJTjuJyrkqKBEAsWaPjfz/KpJ2cSP515ykXx7ToDcPtD898kbdAPRZyBEjeDOGkFamQNb5Jxh8Svo4Mf7SOcYI9T8c0tMzvkiahIw/d2SyAjtir/sLVnR625gUbi7dje38RvNvW5yykcleqoAr8Vy+0WhmWHhFI+A5r5+bgBUzggco6OuRbPBis745whYWhhdr/KG9K7odhTm7+7RKvF6LqCE8UqSS88eHZ3ovZZsPLLgFWoxMkXOUXtT0Ga5MPZk2s0K9PwXKLxO+AjZc+E8ugVWQd4/H4sL5omXRyLy+4GKHg+MsTNkTT1Y8z58BrHWSmWDG73s23oJfcw0kDbRutSm1bh1WynBuwRA8WlkV2tPJ7iqLmBmOdo+VWw6E= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:5KZW1DNhQdUX8142piXZTJH/fHs/fzKLcRVusOJrIRdA4Hp5YfOMfksLOO25sspNsz0tOH3/rDFO4x9MR7u/fyNutON2/3cFPwgZRjOT2lQzedaZwF/DLJMV+qKLoEULjxS5MY26mSe1IiK0KFLwpPo7b3zh9dTGtcUYhEUf2KieW1hd4VFNSYe4ZIa7Ul0d5EtCJQXGL5zY4IC2DoJ/H0XA9H+dOnoe4x7NfYnr4VZbSNj2Rw9in/VfHRkVYsViq3eCWYRmndNF/4tywK956bQx7yK9RuyvIeuMkW/HGgmhh7PIPC6eo27gusZKROc4s6VxXS/yaYSfdVMYC/2c7L4P2D8WxNeQRovxDMjCub/hwMH/njviGvb/ZmdXINYf4LFQdGcYxY+UKwHaDHSvoON269+z+CZ0XtNCnxFPuQpQlsDpuR29jAZH19tPPIRT7S6ybFrPOY+NvvFIbcwSKnCy+YzJxtYUqu5apv9iKe3/4XQSDhkYVUGULBjliCpA; 4:u9DyEcYYZJnKv6GRJz11X8j3A3nIcvbxScE1qILciWS7bdauaBX6qDuxBzAgKBPZZQl4m/VL5xcmH1dzxTNgVxx1e42GI9CSGGSFr9611/JzyN/BIk0M5Nzvdt/+yqKUgKc99efsnX0OxpdTCETGLna9jSp3P7FBADNoh9WvGgq10Snv6MNfCbVvQw5ymJwy2rsCoUGgZgE8/jTmbZp4LnyPdmKS55CejreS7pL7VflrKqQES79T2+JCiI64Kao92lmOBjAbMWsrGv2zyf7kWjMq95jesBjCb12TTzfplQkqv/W07qpLqL2bluvvb5kY6CTvlFBrJUx2dLzpn9plV/3UvkEav2QMtXBuy+vnohLRDD2Ny52X1jEbzkDZx8j29SRMdhA63T8ANdlR18hthA== 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:wuBgww4mhowiUl0D2iObUk/Qk/LteTLai2GTNeGXqp6OkaXnbOthv8Nvo47zSWVqAUiay5lkSLgg8MLjfnpl30q1ZRngsJa5Kx52ZA3e/kibHcV71jaZ19tXtELXKjyfDavOmebGk0rJuMlDcyqoNmT/fb5cs64LTxoqG38IexhfwHFNPmnTzwgCQHisAhDEU2796fFDv8VkhzjBULIvC+y8Le470iBZ+AakMulT82z9itIg9/J9k4HSPLqzwAD2N8SNkcdHleUriWVpBID1X9OSmb0fDb408pHikkxRtUNF6wfiepWloCipO9uZ/A13ruF1jQuH006XY+bot5AjSBR0jRGTbQagId/Uvu1DWPKZu1FllSJNfWLxdQIYgzehJ2fHq7C6jUyHntlI2S5mxQP89CVqRIklm7y8rP7PDVHLEln0bYlULA3VnoiFGS2NCCvJBp8y7OLUlxAG3HKVzO/uWng40cKqC3QyYLvqyTgk58O/neESSBZfwA2hMRMEDMReBDkKgLj8o4sc7SjW1qDygPF3+xjWa2BIgev+OXU5EUhpZXtImCiX2zywGA2tlN7NJNt0mJqhaWn4HHk2c4N9wXMm2T8PbNw09CKcOtbxMxf0po7zyZ/ejs4qpxGxy2X7Z+z3IrrBRVu+JEueQdd51jaC21XqufQY+3I2QP7OGpUfrXPpyEDIxBfKeOCzyEYYL2X96Ijg6tESmeFH614WArmYTEckTHEOwwNTuTa22jmcxfSwdJ8Dv85F3jcso1/o455+xifP/GkVJv6ZL1rMJ9KCfoPEjCnGkicXES+PuJb2BjkIoay6yHBqi6nHW5zfvuyTgN4nw58rRRqruxUkSsc9H+SeDJvFoQ9tIk0hRrff/ZYXFQ7nhhRvPrFRtiut7vZQK2wePmllghDVCg== X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 5:jM3rhjKW7yVAgk1XuPBd2RrMEhYN6rTASYyRZWER3wlyoSmqU0/QjPMn8yn9pryacYZS018irc9h6XA+B141n542HVHGnOCFoWEoJdVXGL5XT5pTtXdCYn8cOCgf+fMNZetXOY3VG6sjAO30TNna0A==; 24:PctmIkyL6No5oflCMSEidbxBus//RWKLd5WVlA0VKXaBJpJlEV7SvKPK1PY051sDt8QCSfWnZb7WGEhSBZr5+3SltAhShyuFyebeYBTquRc=; 7:jczgT4SeU+GfrOtQ/1VgCuD8rFu2P1CFqBJqe9wttNPkSFG2EZb+ktFqI3zfnYcwLvMlrtJ24toK/Iu+wpNZ7PJHLVeigJlYKSZzyNOcaICR4tcu1PqqxBIahQOYV43XW1jMHYKzFXXEvKvBb5XOYhc4K66xl5FiUzjywfZpr+/0HH4hurBbBTkz8jZcETgo; 20:ax5nST3dIkoAs4K646RSHPwInx6FvCZKjl1uRoWuA1WC69YCUhuF4xpTLlEtX0OxtSe+4+qHi+ukEz3qXicIFWeCoxQoCOqj0GI9qT5egws+4Ot6Hi9aerPGNO4h1sqXDwomOCMXuZm5PUnsns5bn/NtFpQsrDioBfJDnEpur4g= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:05:32.7397 (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/sh/rcar/rsrc-card.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 08fed4c..b18f156 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -146,17 +146,6 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* - * In soc_bind_dai_link() will check cpu name after - * of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by - * fmt_single_name() remove cpu_dai_name if cpu_args - * was 0. See: - * fmt_single_name() - * fmt_multiple_name() - */ - if (is_single_links) - dai_link->cpu_dai_name = NULL; } else { const struct rsrc_card_of_data *of_data; @@ -203,6 +192,11 @@ static int rsrc_card_parse_links(struct device_node *np, dai_link->dai_fmt, dai_props->sysclk); + ret = asoc_simple_card_canonicalize_cpu(dai_link, + is_single_links); + if (ret) + return ret; + return 0; }