From patchwork Fri May 20 10:03:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129111 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 A0EAC6048B for ; Fri, 20 May 2016 10:03:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93B0F279C4 for ; Fri, 20 May 2016 10:03:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8893127BF1; Fri, 20 May 2016 10:03: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=-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 AED7C27A84 for ; Fri, 20 May 2016 10:03:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755567AbcETKDV (ORCPT ); Fri, 20 May 2016 06:03:21 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:51114 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754039AbcETKDS (ORCPT ); Fri, 20 May 2016 06:03:18 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 20 May 2016 19:03:16 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id D9D06533FB; Fri, 20 May 2016 19:03:16 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id D76ED1806F; Fri, 20 May 2016 19:03:16 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id D11A71800A; Fri, 20 May 2016 19:03:16 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id VAF08788; Fri, 20 May 2016 19:03:16 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715694" Received: from mail-hk2apc01lp0214.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.214]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:03:15 +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=mxw87AyADQGNfafrcXZd2OWX5ktJKVjeE7mIf6x+yW4=; b=I4Df8SQw5XOzZWfJJc7Z52/FrPOOm/w0MHfFItaP8MeoD4gzJ7rw9aLA2ZTPMtwtv1CeOez1wTdKHFpLEnlWnVqOcvecde5feM+zaVwUORG6Au7q3tzYxn52Gzeq03NBRLiYDs3nVDwgWi4bWpn/GQA6eyY0R/2fQvOpDcQ8ydA= 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 SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 10:03:14 +0000 Message-ID: <87zirloxw0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 39/49] ASoC: rsrc-card: use asoc_simple_card_parse_card_prefix() 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:03:14 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0024.jpnprd01.prod.outlook.com (10.168.40.162) To SG2PR06MB1712.apcprd06.prod.outlook.com (10.167.82.142) X-MS-Office365-Filtering-Correlation-Id: 36ca3bf4-fe73-4158-2bfc-08d38095f598 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 2:HaA5AOKlNhxGzTd9Xyzxutr1QsiiEQ0+nVXSj7a3rX3BDVBvJmqdI9hRE455J7QYr5eAEzjZR1gA24oEyX19Bjgfl9sOBeRAQYXU6OlwdTkx6+TifL13QEIK49WUpZCQ0r+WTuK6+uRi06V1iKLLTB1XCkxQRuK3aA2O1LiaPMN6Y6FWIDD+pnpXgtRmVog7; 3:D47V8lNTk/aanbfUjs2MjdMoETvHJsfbnzUwxQYicrRQE1Hq3tI1GAnlogjK4PCqCpmVOuiI2O4GbEhpAoO6mT7KkfQ8sBBZCOTM25Ciu88Pnu28kJ2TLsxgmJw+d2Gp; 25:Wnk7eivMHaJu/rRzISSEjOQ9nvUcxsSdmtpTs03OpV48/iYCujBWKeYC1M2dChn7rdoXeQKQr7FBPbocErKUtITTVx+0u47dc54taCJqcGU8JnWPWmUcBtDgouDSsWI+O+9is7g5GKkhbEzXzqGWmGIyx3OYd4LfZoAdcTTGAR65iEG9Y7LoUek4BWYt4tE1lTYIwl+oBdp7/19uyNl79MoVE89dLwJzpua5bUz2b2NUCS7MsLqjHI2SqzAM8vHcYK9tAWOuqxxMTZf2b6jbJyjL8JkvPBnGW34+HTBQ5dedJxSzYhLO5I5+TTND10UADkLyLCDhNV+pIbSQTNs8nN+kn2AbDG2LetDnGcxscO4fjKeLgKO3IPzEdhy+xCpE4wIltpv7+4tj+l2l3Axwk9MpNb0+GV2PLB2FXu3KfGg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1712; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 20:gDxEww6meXrJS0XWP9YGPtEegb/KJNDc/jxGHOv/S3ftpsQdaoY44MTUQzhYPzDe01zq3qW61r3zkhgmOCZ1lkQrlkrVecyUb9uzftzF5T3g8YA+rueIctmmVYQOVllE+k5r4fPJ/Wk3AmKcXJa6G0PYqlFZEfULKZCpMxDdr+qgcOGbmep7mW8Xk6RWAvEEKg+9ZAV09oAtANUXZUdBQXY+Sr2tF0QcHW3dCNGeeiNzy/zjdGiR/EX7XSbnJovhgS73Bf/EYlUtE9VOt553mJR7FPojG3PAmDNt/Y8cEPxpjpfsuc/a4hEcEjQhUot/x9MNegqcc/1WD/ygBTtUxjLEDVZ4x+DO8uB0sGccwJ4j5Wz14IybYrJhK2bwor0r3rgHGpOBgS4AwiVd2vySosDBElNVtj+kwt7LniIu4E/fAqJyfiH8OeABuubvZs2i+I0LCuH9//BoeymwTkDrLfvYq0hOoR/aWXI1XpnRvGq83ya5kTLA2w/URBk6dZIf; 4:HRZNHoMxGp81zazVjGWf5XtVIQcG82d3YLbAg4ZMwSLDsI2TH2VQtzWTQ4757u7EIO3stf0P3Epq6MujVgUkFOfhJJJOgtBMgQ40MLbPsDgVbAHMtVz9s/LdOLaM4jtG7cuinznegUFEZJkiYwuJAlRuwLc5iWHSnc+mjdKSoh4iOm6mcxXM4SH+cpa0K5c11JIBKw1iW/8vHnyEfD6dN8bQMmyA10VtBPmb0ULJr8auu2as2qeqb32flgO4SDEd1J29NfTJYTrGdMEMmEBR+2PrCxKyluIN5RKyc9Urr+W3IVW22lCRLOrkBNyKKhTbRW3bLMORuopRr3Kd1YejbhD5iOlYia6MDojxnM1m+ynSr1m+Z9rY9wDhYRirQy51B5GBjb06amMhylQcBXkz8g== 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:SG2PR06MB1712; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1712; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(229853001)(4326007)(2906002)(86362001)(23726003)(19580405001)(66066001)(19580395003)(76176999)(54356999)(42186005)(3846002)(6116002)(53416004)(50466002)(33646002)(83506001)(47776003)(81166006)(586003)(50986999)(5004730100002)(92566002)(189998001)(5008740100001)(77096005)(36756003)(110136002)(46406003)(2950100001)(8676002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1712; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 23:VE7DbdLUNSWQNAFK1mrvNAGvNavLy4H7AWFgMo43Sl53ZzH8Uvu32Itp+Z8IDPVdwX4WCUdQATGvEYCiFQ8qo3+XrXT6qp745sqzGssxylxgISssCCswJkvsgyxAN1Gf/D21NsO8DK+phPIadxkIN06sUIdsrrWZgRQ1/VCQ1ltUAqHjHm3xjscqj+P7qljSJVV2d8QSXIoBvOpFb7+uVMqyVnQazlLwZCikH0eaj/mHCnmBYZF32Xa6Ca044txtUROW1rE05pMP58RQw3Hx0jPDJYAYSii0pQf7knXPhmzWb6PrZZY4gRCyt+mCQft8GcxzAqk8tQS7xJrW+ufFeCHN1bN+d3IS1NGaYpRCrPuzIvMGLa93plck613aJ93xgegarZBLFIRq3nsrH2w/OeeliKEVMHO8FrssRlD+2C7iG0jPZpzZsJ/LirWoULXj+mkxqzBcHP+VobhdAJmbDf2HYildAhnhXBbsmDwD8RswSr5E6m1BRLdrtX3MD/oNiUTztTSh55XtC4hZhQJAraVCsQSmItTu2i9Hvp+ATGDkNqToqfJROFepHZvpiGGIjjUKi0qtIqbK8piB+Kdlri+8XPwgwQ95tKBc+p4r6bac71eAVDRKjs4ZWw9t9vUEteLDfQRXs/W970Ru3JV1Vv/o4ppDgEd3fVQmsF8QCzNqVwn5GzHYQRdvX4uOft5r8lHQ2DrPUk10wmPNrE9aEUkuvU7ywmVxgv/jcO3y8lW1hLIbEnqMzL3NnRITWyCHkiI7xP3xhADI4jCk/7R22z0ViGh0Wk7SyLHMd1I+VsV6/vP/c1ioRG4coPc/a3cbLzTjf6FmreZ4d6uq4qvSnx2eT6018A0r2MQvLgVAaevjBa/Bqy5RpQyeAVQYW5U0/wbK9tu/qPg3gT8sKlmWhw== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1712; 5:SqhoRvidHP5ygpPzYThQQNOr29OsoRGpWkHkwBJgNWQvuC1rFRGEVolVeBVDIKhzob+8SHWhHbvw3F+Xl6gRKeplvSccM91Q6gVorckxeILsUzW764fBVNNMvnbA0RyPUk72P+FLh18UW8LbaVr+iQ==; 24:msHGfML8H/CJTnwJ9OzQdayHyibbYdTp7vx8i73iHKYjAQexOVW1IJo1C5jhOr7QWexF9GakbDCDgv/ka7++weSYc12HJRCvv3rAH36qEhc=; 7:2D5L5KgT5H0qtRW2vQoWb34ZXUEAvCFm/MIJkyW5tTROv2vgl1PYiEmyTriWlhAODtDkhTxlPeOjWbZFaf3KG7xv4wu0BWX/W4ysxLXQubM2LRozAml5gyxqcyy/2t5RtyTEwnQYmAQKsbhA1XzKUW2M88elhHHS+A14gECQ529y9Z4DsD4KsdK6DjUZnCSU; 20:qM/VjlUZn4+y1ojnHkVM5hugElMph4Sp25FFkcuQ6ftD8d1E0Dc8Rs0bqWLXHrHsLtfu0y6SOQJQrw/GH0xomRQmdwB/O7eniBGJ5KmWufF3WuTUyTe2XFroMHEjBOmFDCohT4hlX38VoGUd3NVc7EOhfYyad5lfpP2o8zF3jLs= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:03:14.2619 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1712 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 997f745..3053f62 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -224,10 +224,11 @@ static int rsrc_card_parse_links(struct device_node *np, priv->codec_conf.of_node = dai_link->codec_of_node; priv->codec_conf.name_prefix = of_data->prefix; } else { - snd_soc_of_parse_audio_prefix(&priv->snd_card, - &priv->codec_conf, - dai_link->codec_of_node, - "audio-prefix"); + ret = asoc_simple_card_parse_card_prefix(&priv->snd_card, + dai_link, &priv->codec_conf, + "audio-"); + if (ret < 0) + return ret; } }