Message ID | 87twetgykx.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Geert Uytterhoeven |
Headers | show
Return-Path: <linux-renesas-soc-owner@kernel.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 8C14C601C2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:22:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C380283E2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:22:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 510A628402; Wed, 10 Aug 2016 02:22: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 BC6CF283E2 for <patchwork-linux-renesas-soc@patchwork.kernel.org>; Wed, 10 Aug 2016 02:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932654AbcHJCWJ (ORCPT <rfc822;patchwork-linux-renesas-soc@patchwork.kernel.org>); Tue, 9 Aug 2016 22:22:09 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:53761 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932611AbcHJCWI (ORCPT <rfc822;linux-renesas-soc@vger.kernel.org>); Tue, 9 Aug 2016 22:22:08 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 10 Aug 2016 11:22:05 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id C5FB2469AA; Wed, 10 Aug 2016 11:22:05 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id B81B9480A3; Wed, 10 Aug 2016 11:22:05 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B6C8B480A5; Wed, 10 Aug 2016 11:22:05 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id MAA13705; Wed, 10 Aug 2016 11:22:05 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217603297" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 10 Aug 2016 11:22:04 +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=+Nlx5Ktc7+avSqo5GEvNVhBDbL/MX492H4jFecA72pw=; b=iCzObvXK6qrL0Ykv7xSJqtohAhD13u+8NA95VHoAlp7AFPKcyApo5F7blEBiDtYOHrG8oBJfqUTHgLyMcs0qvVbZmamjJFuLKkBW6dlVZs9HDzBgrRhgFJR97FzSU/JDregTdhkagUJxpWbu+wA3P7ThpeFLgt+FyGBNY8kKdHM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Wed, 10 Aug 2016 02:22:01 +0000 Message-ID: <87twetgykx.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Subject: [PATCH 6/6] ASoC: rsrc-card: use asoc_simple_card_clean_reference() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> CC: Linux-ALSA <alsa-devel@alsa-project.org>, Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>, <linux-renesas-soc@vger.kernel.org> In-Reply-To: <8737mdid9w.wl%kuninori.morimoto.gx@renesas.com> References: <8737mdid9w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="US-ASCII" Date: Wed, 10 Aug 2016 02:22:01 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0003.jpnprd01.prod.outlook.com (10.168.40.141) To KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) X-MS-Office365-Filtering-Correlation-Id: 86915c09-37da-46e9-89db-08d3c0c51d0b X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 2:o0zWPF/EJO4hgvR4/oYjyu+4nbEiMrq3hwU4wrtHPzuHBA0CZ9NrTNOa2HeVjzx0jhMTulKsRPCAsmythUTkqqGdr5VQ09fBhjMoZLAgwjntKABJy2VogF9GdxE11jRYk3tEOTHp6t0jy78gb2Z86ZnPu4jm8TrKAg/XO/W57MWKDXskyfwNuXa+LBQxE79w; 3:dEvO0aVPoJea2OxZHj+q/RW7SSX2IcZ+3Fbob+Pm3LXd63ha8L35vXljHl/gwhpkBPtYwh5M/NgsZsFCj6QFUjNMRVWREsuV/Nx2lROIwqwY4Ie7hiafc3iluclOlZU9; 25:qsN0ge/Y1uYW64eEsmcz8eAT7bulHWx8nHrxdrgIil+XvNYFmo2w8M9CdAuje747IRYBrSK5FQaMn44TpVfMpF49Sjk/4s9E1r/KXDs8uOPJkje33nUNjSH/T7082rOJGTju7dBii0rLhbFP8Yqm4BIszhD/tvJ6yuN8K2FSo3DmGgLdUPboaSBG+Zp82aW1vnrOPv0Gf+9ufJCWPrEn3cOLVwEzHBWSILoVtf6HBvFCVZbeC2SQZ+nCnWLgP2CB0vgtNSeDZV9VUHsM0kDQCvSe8se1jyW7kVH/NCo76ZyCzOjJfIswo73+0JkZkHpCeRpQhDQSJyRXkSx3O9iwVvALQILOFTYM+9h3f99Ad8Y4ladC+4DopT5/QcBJF4loVpsJQLJtX0QINvecgAWzkMgaZ4gEY5OgGXOGZFAL55Q= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 31:FDXezE4wyxBLZE6qSVkUa81crGUfSRhvv58kxu4U1LkmvqT5s07MCCxTU5doNPBVrxS67cZgoD3Ws6rwUgMs+WQOgTexlajNcvPCT0Y2U07ana9EXta6KSVoEc+dQmOv5WHHhTf1AhOxWPAUqQ/XGgjuVr0lfom9zXs30z3n5kAHOuQ15gNlYuLJiA2e8z+EYAejmX7YcnR/h9VQz3KldjmYy19SQgkghgYPXwKvH+4=; 20:Z97wLzQQLn8nH+1SNvoAQY1e8Ryiikj8cpeR5TiVNxATEoPpHnBpXM8VA6X5rgqbLMCV4opGQ8UfMPM+eYZamAVIB6L1bPeXDZKHwnUAH70jIE8weAjQGF9f0491YbSORfxSUvILhBH67qy+CQR3xayKogsec2B2vRsLkSXam555Daaw1P1O4nzz20ncgDpjLsZn7RLgBQMRYETZ3XLSKcM+3zZ/4ccfW7v1vsEsu9t8lAvgonPflAzND1ZsPSaj3L39snnc13RpsBRyD127p4VucK7CZjCl6RqiFjVyeyohi3syG8EVLY+ij9AapSs0kHaKdc4RqDsWQjvnX6J2bnk55qWDVLbYA/OI2UgNKDPh7vxg+QBx3PiNt+3ecMPTcLXmTk03dLSUl0cW2R7NVowaHr/agbAl9qjCU6qd7oS1hCiJM3vHVk6oKfYkRXtZKLtiaxnwzWYueeWMSLL/PeF854owrdCit9bgZ/vFcl+HsFZQhThz6OAbWEE5/0na X-Microsoft-Antispam-PRVS: <KL1PR0601MB1445EE228B11C230B0AB7AE3D41D0@KL1PR0601MB1445.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:KL1PR0601MB1445; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 4:Z6ml4VOb6R8D20WjO+cQz7/att/oujo4MVxrjtVleDmb6bse4PHxliu49c/i0+UfFqIsoWyo8OPUp3PlUaXiKG/sjVCQmkXMTVn3VmWiNkHDCaG7znsUYNkz1v3dkDH2sMKZGMJrNc/mFzM2xjqRswR10+0d8AT4QYiaS0X8PQhgLARCdpEPm3/S0c7csEae6xoKndo3H5zSK887j1p981vrSIWRGWpAJl8WWWiH3LQX++n2jxsnj8AH5V9uXsN0UP5dm7xybJX0d19ZZ+MSndp1F4B31lX7GXCLlVue/LJsCRFsbqF2ONN4RAmHtoCCox3OENCfAo7CD/A/bPNqE2uWLJgmbqS0+X+sDfZQ0Nz9nohTlgVvqgKY2lD36DcSHlNqAp1lLZBoU2ZxiaRVyA== X-Forefront-PRVS: 0030839EEE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(979002)(6009001)(7916002)(199003)(189002)(19580405001)(69596002)(19580395003)(36756003)(47776003)(66066001)(33646002)(68736007)(83506001)(46406003)(110136002)(54356999)(76176999)(23726003)(77096005)(3846002)(6116002)(50466002)(586003)(92566002)(7846002)(50986999)(53416004)(7736002)(305945005)(97736004)(4001350100001)(2906002)(42186005)(86362001)(4326007)(229853001)(2950100001)(189998001)(81166006)(101416001)(105586002)(81156014)(8676002)(106356001)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1445; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1445; 23:e8Y5CKW0NwV88rWwCi579VsG+wGJDKCMuSPulKU?= =?us-ascii?Q?XNN9HYdJRJan21mIjhrMpoDEeQotF48Zi4LeKstcY06V5xBjDkLXm4BW8Cu6?= =?us-ascii?Q?UYOgd21IRAyW1tYUHkWFIMsd/7cX0mug6N11JSC+UCtHJRDcDJYhC0ikvAgA?= =?us-ascii?Q?fw9F0FV0fsqTRJPE5V9e6M8EpD2/kdfbfrLV7qWl2r0X4mHvZeVNN5hCbZgL?= =?us-ascii?Q?G6o82lXhH6BIl8pXStKxdUvTQWSCxFZjsH3u5sl+H+oKE0IgCc/NcYFGcIYs?= =?us-ascii?Q?w9WJxoK8fUZwzLhY2lSQJcsWO0dtYqoLyGd3xFhkYtAO2mmEm+jxt0+4cucb?= =?us-ascii?Q?BmEENXpx3oB4aZ+azsOANwTIPdLqe1OFY8bx59rHnPIrAEad/Sf552NjBUPX?= =?us-ascii?Q?d89YMN/SW7CkduEfk3/7G8RbCm4DAna2o0Aj1M9HLTr2m9cBOLs1Hca+sq1p?= =?us-ascii?Q?o+5RDYC95AYMoQd+4/dYme4H+U3OhtXmLKlHhO5KXm94ug/+aruP6q/3a0tB?= =?us-ascii?Q?6xXe0RmQDoZK5/qZgI6Gl/xKqtHYXpcKExSUjHY9LjMcT1ylg6tMCwktGA1w?= =?us-ascii?Q?gQHe+CKYoWbO8e9HBGilEQl7/VbSbUKVJMVsdPnlTyPM81sgLJ7qiUMTwFsk?= =?us-ascii?Q?nv8Vq5aPAilBe2ExZsjTA1lpQF8CybTUgexeatWFj9VGgAClrgMsH5F6xKvs?= =?us-ascii?Q?zF8xmbklyNOmYOgjZZDQFSZnO1B9kOk7gKqWx6nSoqSifPgGo4Apz26/LH+B?= =?us-ascii?Q?ISqipGn48FFagvDIEi0WpRDXpK9XiuXrsL+zaVft1waAxABlo4i9Q3Hb7v0B?= =?us-ascii?Q?Enidpv4hZakZDuSpqUBn6XWuD8xBWnHJrbLyBHaSDnkK9M9ZgcgFH9W6IXgt?= =?us-ascii?Q?MvEY48zWkM0kmEG+lEDxLsuqgQZij1nvD4PaQzgkPMv3OzynymSuoli3exfD?= =?us-ascii?Q?GIFQ300Zy45d1/YFQgp+i8XEf/sWAHjPEgfLF7p9BWveOuswXapmumdmjnZR?= =?us-ascii?Q?lGRX8JwqOnny62+e4k7AQFRc4GxW4idBBkk53CSLnE8S6RQoeGtUIgJ1mERR?= =?us-ascii?Q?nkpdt64tQ+ocaLh0N/Lte7K1g+lHsaFPRBrOtzlZZmIxJIH1ECYDOkhY9pk9?= =?us-ascii?Q?DmOxS/0B7MZxOacyvNaO87flzYJx5uA900atR96NeuKmcr8+/gmIO/odhMN0?= =?us-ascii?Q?UFQgTRW1bES2iCMIVYqteypcnUtmH1xbS7YJxdsCARwkPtB4MMFCe5Ezulzx?= =?us-ascii?Q?6jRvp2XUhUOqHPjlFY7Y=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 6:cd8nkyMMPpJKJga+cnPk6N7dhLDSiuGZ9Kkr2ko2Uj5FMDd4p3xQLXoEXkkzHc8pm8d9xBAG/BwEM53pWozp92b2bwTzlVzMPNyv++kAoK66LIFZi8qRHHeWW3v4JmzGgLyJozrcua7BTWQiZG7D+Rmh9HoszvoirDusTqJ8wi60ikwQKyjSn5XhGV+HTxEv9YqIl0W9pb46e1l1KAjSi+Jc3kHLs/EznoDaDn7EkrpdaZHywZBOnogJsZbax5OJo8USWoPghQwXS+h8n4VzF6xv+OnWQczT9YgtnUcLfxtMaKDg80p64lXTZlsv6Ps7VjkVt94ePFIbja5c+3i/MQ==; 5:e8p8lOBTs3Q7/lWeGHbamR3IAabmP/FX46mlscrGYWG2QpKmOyixYT3qszWrp/vn7AF3QdE6AZcg7PpiewrBdO2YvD0TyTDmGi4czj9wQP0J5BT58mcJ8ZK25CJZcGE6dWeb/QvgjfD/Knar5PtL1Q==; 24:YicuRz6ohLmaUUCzMv28NNp1Q3l21O++cX1RDvBQ+msIUwJ2sKWCpsJzTJhok9t+/lLKKuOSajG9a8CRg/mxuojeiIimGImijtdKbaJRdh0=; 7:ZYE6Den2+cpbDHY+aW4S7yflRsBIFHyjhrtQNbrG9+FJ731iLwinqsz5KR/sPv9MqPnsAD8++k0pNSPAO3FrcA0G+xVkT7CaHFvI1C3xICpBAf7rUCFS9pMfgCy3TZmGC/PZ2DSlKfpXCSYVZFTqqRaMexyb+0rRmkGxtZiRsn9ymg+3kQeBrzqbIgbawIpAUfI4DJERcBZS+pxanv4H/UpvLCoT4VT65BXjV6D5A8n8TpPf0ShtAPi82nTeEXNW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 20:6C40NaYGVsdu6gRixfKBHqmCOsyc0IoJXrecqrCrnU195s4Pq3K+W2sfZKhHCOXHwURDYH9NwUur2LD/RE29VcSnl4y6UMdROdQpLQ+aC+H873+VzMg09YczSgaeRWh1UlBv+b/Pu5uRyYLPNU8ZNiNyko35PHixemr0gpESCxQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2016 02:22:01.1522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1445 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-renesas-soc.vger.kernel.org> X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index dd5eda1..16dc13e 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -333,21 +333,6 @@ static int rsrc_card_parse_of(struct device_node *node, return 0; } -/* Decrease the reference count of the device nodes */ -static int rsrc_card_unref(struct snd_soc_card *card) -{ - struct snd_soc_dai_link *dai_link; - int num_links; - - for (num_links = 0, dai_link = card->dai_link; - num_links < card->num_links; - num_links++, dai_link++) { - of_node_put(dai_link->cpu_of_node); - of_node_put(dai_link->codec_of_node); - } - return 0; -} - static int rsrc_card_probe(struct platform_device *pdev) { struct rsrc_card_priv *priv; @@ -373,7 +358,7 @@ static int rsrc_card_probe(struct platform_device *pdev) if (ret >= 0) return ret; err: - rsrc_card_unref(&priv->snd_card); + asoc_simple_card_clean_reference(&priv->snd_card); return ret; } @@ -382,7 +367,7 @@ static int rsrc_card_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - return rsrc_card_unref(card); + return asoc_simple_card_clean_reference(card); } static struct platform_driver rsrc_card = {