From patchwork Tue May 31 09:13:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143963 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 E42D9607D6 for ; Tue, 31 May 2016 09:13:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7C7C2793B for ; Tue, 31 May 2016 09:13:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCB0D28185; Tue, 31 May 2016 09:13:34 +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 670782793B for ; Tue, 31 May 2016 09:13:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756741AbcEaJNd (ORCPT ); Tue, 31 May 2016 05:13:33 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:22513 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756867AbcEaJNb (ORCPT ); Tue, 31 May 2016 05:13:31 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 31 May 2016 18:13:29 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id C47E75364F; Tue, 31 May 2016 18:13:29 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id C2CC8480A4; Tue, 31 May 2016 18:13:29 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id BDE0A480A3; Tue, 31 May 2016 18:13:29 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAJ09661; Tue, 31 May 2016 18:13:29 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212432679" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:13:29 +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=oaS1hRKWNmbPjtyxB8LzdqhTjrKjiLqkbMC0u8nw1Ek=; b=oYy9V7O6KZwkJkgPhODo7rX1m2KN9p3StLmYGg6/PYQci17R9rxn+kDevTn/YW6d2bnPejluHQbbfQLCbI2xiI+nh/sZY4gUoFVxyOoDIJBsEEkzJyPyNMTBfBlGH2rP/Xnfnn7OkSfAVBrdy8P294zK6xbABb/EXzntRwSx8Dw= 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 SG2PR06MB1709.apcprd06.prod.outlook.com (10.167.82.139) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:13:26 +0000 Message-ID: <87zir6ppe1.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 36/39 v2] ASoC: rsrc-card: use asoc_simple_card_clean_reference() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 31 May 2016 09:13:26 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0017.jpnprd01.prod.outlook.com (10.161.225.155) To SG2PR06MB1709.apcprd06.prod.outlook.com (10.167.82.139) X-MS-Office365-Filtering-Correlation-Id: bc744054-7adc-496f-c2d6-08d38933d381 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 2:etALyMQNfSDHWNix/Hs37NuVwmmrZnbVaI5+F6A0k9aWEmiq+KQCtVHbCVtKKfgy9b8uYRpYm+Y9DeSKYc8+tymzIlN9cX1m16/RTUVfoPc8nUY3c8YksLzMy3mARLoRDhhdw/kXp2zNpFl/MKy3WoBkuZQ2KUQpRRboN61c+usUhgX6sxaU64kQKmVrCxo9; 3:xCKW3mPfjvn5AybXBexTpKNVhwe0OBGcjSFa9qw91uUeg1s7XSEtBjFf8r15shgiSygJKCgpfN8jP2t//wFeH72HjubkK9QtTDge9Nb1TOTvqMu6CGjqMk/ME56r4Jbg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1709; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 25:/UP0GQruBuBazSwJAx3lxKCs8szewE7iQBBjE1h2I91gukOZibEyITtoNGg1bf7ON7TD9btCez8l3ltXbdBwcNfH5HtsKG4Bo2JrRBHAw6dHWk40O9WY2IyuuQdnUGi9gOw/a4p1c+I4RNOawK1twmLmkuQP13JxrEgBGDtf2X8F/HYZj2qSiOx018lAXtxwy4Gz66JQ/aXq941MpEZBq1L7rayDs6c8eDUtFEagzX98NGPsu93Ljkast5qvR9aJUuKwMVEqLN3Ei1gSe5pyg2EGOvKLf2+SUpYloEIvG+okMsHDXwPvCCHiBkqDafVc9e0LrdEBTZVseSnDQTrUWDuTp59xgQNGaImYINaihADwVoHm2ZbdZzFvYRygiLTUy9g8zLOkUApwcsyCqsZg91T9lGGWzoXzk9l5xe8pr9ykW6+MQv8mM7B9/Cjzzi3vzE79GtMQ2VOfI2FeQJeCCDRYmvlQnOjnrzeXYBVJgsBLV2XNSjrn/hXGqCAsYuU3Qb8vDgyeMHgTBPfw3ol1MtR4hgFiqT7R5o4MHpdfPpMyTsHdQqyugeNaWN71dIhGCrukxdOia+anZYDwbJi5kmg/WSS6mtkpyqmAaiPEl98q8lHfVqiYIhZxBsG9UNUldm69uC9Objp2Mb+IKbFYYdZXZrsvh7P1ZddemVJvlCRsafLXQPN/vfby4UHzJyPl X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 20:3y0mPBrC+hpNqxLky7A/TmW2+8ubDv6i86bSWJRzJx8ZOt9YJlr8XFGII+P2dq+dp/f14UkGomV/vd+FYpKywazoRRiIsBMnl+CjYYTo/g+HMY9acqLpCt2rMnKsw3hmuz1yGtk53U/x1lxk3doG/7h4QBXspPd8u94Wyhue3b6tWrQ34ZWPKseU1vXAFqdIK5HahzSRcsXBu3alfQ7uNJ7cbq14VrMHW1uRQz7gVg6UvoPHLJm4QoCTSoqGJTSp2ZDoAcqtl2OFXTA+1CSk8mf/MDwjxh+UU+j01OUlgewiMohf1yMN/FyfixWm+swGHYg7nyyNYrx58Zzl+Fx6mssE9e7mZJmKWXcQaD3NefD0qnImgI/W4Jo3JKp629/mujavC9wr1KdB/z15eL1i1sD/BCs2PtIySMc/yoqCb11uvGhBgc98zyihkJP3+kzzjStLHkayxW976Kl3bGb/kGBUcNb0WY26dMP/UndlU8X9O/+ogEf8mptwDTly3sJ5; 4:X3w2MSgdvfxiZY40/5RJbiUy8tcLha+RJqRI0xxNCMSQQZLgBZiHbZdfZZwk2OE7nwSYYRz7DJIxPlsAG+Ebv/t3m78heiV6PAprYLLWhJs0ioSJE50DsIVFapp7kK7XBaGi+AKH/aywtPV7rnricb3jbcSgRSdktD/htbdxdWScKYLTWRJffSUL57o2rSsmGJWO8lJD1efAG594mLDCIxnibLitEJfZSMMgXGYg9+QZG7/niz7ShUjTtr6/Ob2202yCcUTihXD2uBXYWoiafW2+Uada9fxGwWNmuSIJrI/UL0y8gROqLvzIXcqpRiduCDvpDtvVS83Iu1+gBgXtz3WAACj7lqbf5zLgZVPFeO1jnbkrKWen7ciq1zRTpkdY6baDA4whTc/8V+7rq5Jwqw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:SG2PR06MB1709; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1709; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(5008740100001)(50466002)(4326007)(92566002)(46406003)(33646002)(8676002)(586003)(50986999)(86362001)(81166006)(36756003)(3846002)(6116002)(229853001)(76176999)(19580405001)(19580395003)(53416004)(54356999)(2950100001)(23726003)(42186005)(47776003)(77096005)(4001350100001)(189998001)(2906002)(66066001)(110136002)(83506001)(5004730100002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1709; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1709; 23:vP98jsr5kFCEr/TNCdk092v+w7SK72AfAv5m8SdG8?= =?us-ascii?Q?vxJEm6vMBfyIOIIxWP78nMJ2ju20cO/RqLVGXbt6uLPUSWXZD5/HYyCsI7gM?= =?us-ascii?Q?dzRNMJn8eJb5J6MLUfIqgKdE9hOkgfsgQZGBYSl4S8MhgATDsJsBx8Tvsves?= =?us-ascii?Q?nCy4ppfw3bAriKLKrm1RrY/Lvn5C8GfLnXi16zGWBm00KzCo5jesAqZ0yROB?= =?us-ascii?Q?1jv9GTkalZnu53R9Fb45H6uvgyOonZ9jqBECUWX9yANKCVYnuJLBiQSdl1nt?= =?us-ascii?Q?2mVhmPPBt7E8sqtduPIteg6ZJnM/VcXD3vjTg5JHhTRajiucLRact5AlDYTN?= =?us-ascii?Q?ODqxK6Ge4MEBP3a4CHP3uZc0+cyIOCWk/HhByOKuwy2LcIMr671xlWYxbEWy?= =?us-ascii?Q?IDEQ8HG0ZZPCxlQEg80FHrmBh3tjyajgZ/IKojIR3ba2fzq1X6RA8h6jr1wg?= =?us-ascii?Q?ibP0YsxfRk9cxgyu5XiGezSKnXXhZp/W9Cn+jSC3QUGCEMPZ4aIZFwBPyEv5?= =?us-ascii?Q?K2/2cExJQj83r3R1BGTr3Nz8HL5qFoeXsVOE/Wff+RpdaVB5fBgZQAk7LJLZ?= =?us-ascii?Q?CBkCOyS6EVVVhP69lOzzAIFXR0AqhpP9u3cB+cykkGx9w+ZnZtScbIZRSIMA?= =?us-ascii?Q?mCMPZ4EVvH5oN+N2tGcFI9IaCIFL/Pz9zQaBS5Ehb8pEjaN4j2KXPTYK4kBg?= =?us-ascii?Q?VA6vprSXCkD+8oZFAj2X5nuyjQhWLAru15Boaf8s8Jj2NqaHeY/mOEAPeGE3?= =?us-ascii?Q?NhJTo6cRFKAcOKNryIrrHprTosQsFR9foj1tSyp3Q8Ghk+a7za4X6vuW5Eck?= =?us-ascii?Q?Ytq6oFReC+w+riQgexcHHm8tV+8o4FUJJn8Qmv+4d0mXgGfKilzK1Pvg+1tC?= =?us-ascii?Q?fpORewtvw8NzMMnwdRZhGh1rAKcQrzlhx03/TlhtT6hhX6OZ4nG/cVMK4TAE?= =?us-ascii?Q?2sYwXKCz+vv254rqPh/2gJp+GscjEwHUbnwVXXbCA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1709; 5:OWMzzCReq+bZkbibgLyASsXc8Ne9soy9YEGC7EV+cvO1mLeW0v1zGuCI8658Zvyop8W5bCTDGcL19wKPQEuTkM/CIwRLiNILaUudghtN2n/r9lgCbcupuC5ijSE9Ic5VR1p4JfHqYoyNivCUDD9CHw==; 24:WAqCic9nqok3rA/qkdWO00tGr4lcW3gRHaUhT0FQlZ9Hp57zJ2dPNzRZJWyRnst1p7a2j9cY5RPjtctkYQTdtJdIU0t4Lw81PcEO6ND000M=; 7:kxiTtvyGDb5gM0JaFj1IuLAhbZZVAPNaG/SY424e/5pdUphADbsn75X3wDGbZmPr7JYz3ik+LEZKCuV8uivWxx26gg57knpMgy6sJgKQxVj39i/m9xVu7fG3GEJzVBxH4KR+F/R7hXiVLbI78JcwklzpJaAEi27HwnLoFoMjP1Ra/uW2oc3OWPFSecJj/Kf2; 20:qcI0xiTou8ipqk1Sw8iJNXggMmrnie2/3w35mxnL7/epU2vR0WOHrtbJ3QeTAe+Dma0tUdw7RyHwIuIuAUATYwA7x5LhYRHJgTgH35uCDQntKcaYtBjRA4PxOMHPLiQV/1pcolnaaYXjOIibyyQOFR5OZ+nkHm+Lj3ol5i9UtUc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:13:26.7643 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1709 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 | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 86f3df3..ba4c7be 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -324,21 +324,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; @@ -364,7 +349,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; } @@ -373,7 +358,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 = {