From patchwork Wed Mar 15 04:44:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9624791 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 A2C3360424 for ; Wed, 15 Mar 2017 04:44:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 988B9284BC for ; Wed, 15 Mar 2017 04:44:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BC9C2856A; Wed, 15 Mar 2017 04:44:50 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A942284BC for ; Wed, 15 Mar 2017 04:44:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 86419266F1D; Wed, 15 Mar 2017 05:44:43 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id EF8DC266F05; Wed, 15 Mar 2017 05:44:40 +0100 (CET) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 377F5266F1D for ; Wed, 15 Mar 2017 05:44:09 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 15 Mar 2017 13:44:04 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 6396669526; Wed, 15 Mar 2017 13:44:04 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 333C948014; Wed, 15 Mar 2017 13:44:04 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 311AE480A8; Wed, 15 Mar 2017 13:44:04 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id PAA26014; Wed, 15 Mar 2017 13:44:04 +0900 X-IronPort-AV: E=Sophos;i="5.36,167,1486393200"; d="scan'208";a="237548350" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 15 Mar 2017 13:44:03 +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=i2Id/tVoAEeB5XR29t9jnzgLSxaNMA0o62vNT30blAQ=; b=AeKMJbdajVFuPH92OrdLUxMaX8gTwO7wAPU7GTSQuPTUQT+abVlo9l15/YxwmvHsi2WQESQpoBu6ZCC62l/GrZb500TjIx1/CoW0xVfmMzsv3sa3VQvmlBpqrrulj8PMwEgK9X7Xq9t5Q2E3DjnS1wwqrpMFXAGOX9dsqPmRIYg= 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 PS1PR0601MB1931.apcprd06.prod.outlook.com (10.170.181.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.961.17; Wed, 15 Mar 2017 04:44:00 +0000 Message-ID: <87innbcfuq.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87mvcncfwx.wl%kuninori.morimoto.gx@renesas.com> References: <87mvcncfwx.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 15 Mar 2017 04:44:00 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0052.jpnprd01.prod.outlook.com (10.167.144.11) To PS1PR0601MB1931.apcprd06.prod.outlook.com (10.170.181.17) X-MS-Office365-Filtering-Correlation-Id: f10d6a0d-5eaa-4590-6ed9-08d46b5de631 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:PS1PR0601MB1931; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 3:53f4R+n7nMKZFLYV2Ofp48I8sAzEzffLSsuVmFsQ5KTDQ3d8CaP+oZuGUZGtAHom8mfIJ+80v3V2Z8RuW9jbsCibhpBA0UfepwWRS/QpFKF353CM5wbHhEHRBbZtL12Cu6iiSM59lmgmdnuj7NXhFjaelyIAtsbVJI8nggrpHPkUhWiNmzE22FY/lzr6Wt78InnFHo7yZHlr2ep1v8B+kK8Rnqs54/kqclxyQC0jrbv1g5SDKna5wjXhlScf5pIy1XB1Qj3az74L4ccraFin+vkj1LUk+Rku9xyvgKqHG68=; 25:IgxrN25Ppf0zP6e1gxJfGRmFEGwt3kqispcAZHkU5PSRMrL0JiUpbDGl+046bM5dCHHdqTHV6sV2kcXpDXv2v2PcxCqNsfYGxx5ySw3IUezCWfGJaIvz4KXKRv0pXRM6kmudCijlY2FU55QEBc9+0yVHQTOhDJX5JpQZe/q1foM5OerDCSrv+rsOfpciUpeyH/E7i6bTmf/wNvE7KeReTvB2td4IYKPdwTzM4kErxHaOC/iFRZnKPO6/7l302yggiAeAzY19t5f/UngM/WyiksOuo4ps/vuvSuofOZ/DzZiy7xgTnSowo8sM9rF83cWlJ2p/4GwDzdFkXYzN/3u6GfRjSsoRkOBDprYT2L29fHuDh31KcDGcuaqD8aLPpTLdd4E7VN2hMtTqLeGaMtBk6s3QGR+vQdZGkBw2vt5NW6Qt9jfzv+Lvp0bgFMx8lY/sLVNCXv2zkVqvQ5xvh/gtmw== X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 31:FABCeam6ymiy0jMCdoIHlsVjUCfv6wr1/qc2XOCrlfHgW0xTZ+nJtEIGA5UyDlV64d1dEZ9OAEWEfyfBsYVvgU6Szl2JHAbV+AYy3LPViULt/KR24XE9na0kC/BANRpwS2uYN93nNi+3fozn1mKrn63nGV4s+mDY3KcuOMQVjB5WicHvh/QxiRCAVapvF3XWxWNKi/rkwl7jbZRKKHG7ZQU6JZ+Iju+fJo/VJ+WDOY6Q9T/IEi7CeBgOouj9jXaR; 20:BI7JXY+uZWFdTngt4q8DYPYrbPrSL0hYKeFf/dKfuWZeGEfbR5EHOlReZtx4MQiXHoPjO77Eum0UNluK0cVcGfde22ChNDjWzBloT41/tL4m/3RZfVyohcehCaKb6LwFAxv87NnbjVAnkQPBhne3QNba22sUB72W+LximnCUrAmzOvoY4Y9FI5rAhX0useV5H3vJdXjRoGZht8PPJsA8kXD+4Ey5L6Jv9dfz7/PpxsmvD1InwkNoPASTO/GSRPBFgHCpUjiZ8pfLP1K7fZklRujpl8D+x1sJP2nAVukppokD8+4YCaDXNOynnHCrBw4srA6Gk6w5r8/aloOZ9Y1ui6fRPrB4VlZxUSoJRBwDnIU9ldouFAbagl25rLMzrj/jaTa8VyzmQqqysJ7U5gGraCGIV/t0S0LTouKvFUgxWbrylh0PFHJP25qlRa4bwWq8gAUYPk3v/eiENMTFWol9+7uKJjKi3qu2YOOG/xxQBFGgIdrzv0Y8e8TWus9m90Gh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123558025)(20161123560025)(6072148); SRVR:PS1PR0601MB1931; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1931; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 4:FQrS6xYsEvqquP1Uoq/WwEB8raJKDRFKJi8DqJEYV6kr91PJFISAW+pJEyE2Fa5FaEMpWCuUjApkSjukJzq/O6wVzQ34gq8gB3EckkXttNgiBNIM3WMlxRbtRFgStju1PCgfhSVDQGSMi8bTloZfynNgiszitX1r1G4ATZMIa3+A/x5iN197+MLZAMdZSaJjlXrBy0vBzZdlAMAJHvD6boFI3K/wZYrwEHDCQV9t7kojZgFtRU6uLS6gUm3PtuqY82dp3T/Q5qo9vbNY5Q+xnq03J1adj2V4rmD9ZIfcey0vSa0uINXGml+PuTTUz4tOtVBupx5n8iNeq/TrS9lGNi2l4S8aLGxRR8d0n4UiAEiGxwdp/pTguRKE/LWBV6yxrFbMghFQQZAEwxscucxMpUiaYJD/Hcl8RBueiNdNfZ3DyV0np2DZl7dJWgX8ZPTT7X7pxFka6om7oC9XcWkTLexcuAKCO/zRJdvRLnoCyKFnHnnBVQs6hr6w8FPYiSOIzuAq+NPaVQULkexbsjMXwMVMzaY0/+euCvEHLEzzCWtFiRZ34DImVKfGkWN3XG/CvRlUya9ivJ75jhVHwDDDlCvadc7l2de9xU1zzXNAKJQw3QDhHqyGqS5pbJv9g3pE X-Forefront-PRVS: 02475B2A01 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39450400003)(39840400002)(39850400002)(39860400002)(39410400002)(76176999)(7736002)(6116002)(54356999)(50986999)(6486002)(6916009)(25786008)(8676002)(53936002)(86362001)(3846002)(2950100002)(54906002)(36756003)(81166006)(5660300001)(23726003)(305945005)(189998001)(50466002)(4326008)(2906002)(46406003)(38730400002)(42186005)(53416004)(110136004)(66066001)(33646002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1931; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1931; 23:xEHVsJEiRkTz0Du+s2o/ILvsnzQfrCgE9a3RlSl?= =?us-ascii?Q?grT/EJIDp50yX2mqR1xhcPSJbuYq2s2RWPEnaXIsws4psRkgEVpHLMy5wu34?= =?us-ascii?Q?e13TOcLoSzcDoBX1x60QcTL+OfiqWS3nnXmWRUrezAQ1cFkxNtZDvmiQBbZx?= =?us-ascii?Q?FMQ/uSyeCguNJHeA3Un+4gEN6OWRw7cD0X/lVEzRS4mkM49kdBl401wkZy8J?= =?us-ascii?Q?rB4GUe712NfgBJpXyjpocMwI7qel/rPIf+V5pYyEAn2jk6C+xxoTShJclSih?= =?us-ascii?Q?6hCCK6RY4jdiRZ7MIF9ULgG8iaDsML14xeo8lFu8jxmyNTp3k+hbTCbwjIaJ?= =?us-ascii?Q?4dpWdB8m2T1JWZNvPTOHrHiBVUzIjbHR+evKogVFjAaCKsYYfNJpYJ6OSpNE?= =?us-ascii?Q?h7mp+vTvho5qkV6si5QgZhbCAI8CWZx2K4G/f+BpG0YNBCLoVJDU6/QSt4lb?= =?us-ascii?Q?M27adFdqeCfRTkd6ip0PrDNngZYzpgZgRA2A9Yy7yE1PtLLxMN1p751fZ+d1?= =?us-ascii?Q?7AYZX0qeVkbYjUcf01yiRIE7ycjApF+MFrz6zc8IwtzD6jEJnU339NHTlGjX?= =?us-ascii?Q?hfW7bgwG3Qpc5+hbrP9uGb1ClhdTW1S1Gjqsn46i7z+X2/ZLE2j36gJ73oxb?= =?us-ascii?Q?FJTey3rA3befxeBwBo4rQ8z6F+eH/pL1mhG4ekYi4M5EHMWT1CWptrUlaWqR?= =?us-ascii?Q?MdC2reFH+VFEfNWbXYypYgM/3294g62JfHFYKdAp9keE28fmJHzsRq3fWP8W?= =?us-ascii?Q?UBPGO1/7KNm+ecDundc3R3mglUj1EmhS4Wj0D2YNLUBxOaLHCUbpnImO1X7q?= =?us-ascii?Q?8IKlGl1/1WQWszQ/x/dJDbV/8SXIOu7p0ogJApklzPlxCmwA6GF09HIKhN3D?= =?us-ascii?Q?bzr9M6IDJic8CRJNHiyxu0mjkZT/tkvSt9urE+8zXWSVYA2JnY72WOLZIIIx?= =?us-ascii?Q?+mfp8NyiYhjVAzWJ67JizU7IlCnTrk/hu77h4foxulWS6E4pFaLM3Krs7+RU?= =?us-ascii?Q?B4kM=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 6:SLd6IgJ38XF9jgrGSlPw5irYN+2l9p/ZVqDK/7VIEMGYFjyn2uakZtJ3pR0c3XU1gRt4tccYAg4IRi4SrvAvMY0oBwSB3zxGz8RjJf/xAgNF7VqPV6J1PQ5GEzIMaMpXEJGdYOEWGdo6SWHgdizSxrXziDpJXMCGez3bv9jXlSMA9yBCnJrFQQ1PGusYKwVNzfN4K64ZTWYumVfZV5/gIpOIDCmhTucxRZeoXU4Sz/3uJYFY7yS+F839VyCpLgg4COZRYPpPF2z9M8HCfg6joU4UPiatMha3LNAS+P/O9NWqLcPJjFeP95DA4b59jtjPQ6Cu6N2ojbfUXNffd+S8Q85NI6k+7BSZelc/w2iiUSbi/HQKkvQo9wg3FWTdqvE6eycrcxclMtzrghH831qCuGeIOjMG9EfCk0pO/dW3TKQ=; 5:r+vPpK0GLDblrLoBbLWx/4m9WNNPAzrWCDfV85XPGXAfo2oF+JaU1OHGxoZr8wh4YcD54adLpUm4I+x9hxXIglMI1sEXCGy8HkfK2TRKknAPWkRInWEBtPiI9p9dIstdk7HM7tKeRssUk8VBjV3i7A==; 24:5m6C9NTEyb5bhVKGfFDILs17QLzQGL79o97AlEbi/S0ATjvBCZkvGCAMwY/jZiW115xeb82XgVHecxaK0S2pxHSME8tVtButBUCfSkafleg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1931; 7:YWrs3sAO6PPNvBrs4abNlPRw4Ioest16c3qOulSkQ/ZxKuZEMlcsV1c0+nJFtm0l13PclKKFNZxUf6fki+ALf+wW4zic4D/0xLvNKYy+woT9q1woQ7mEqTKgQYEVo1K0NT9hZI68GMcwvTcoUQxytskcT3O8DHEJ8OfdcXp5V8zaC+wU8e8NG9Pu5KtrbP+JLjDzy6s5dBmNhyTqBPER834CQ7uE3YoQBeDUrlnuf5uHdWpP9fVeWaY0NjL4KD8Wag5wZb5Wx3uDP9cIn3pBP7b38D76wwsUIfUvns79wETaIhHOU24ttHhOMwsTHmUzZh73j6SDlh6ucOboVmD7ig==; 20:bIPZPjoeL3bVTKAkC3kIyz/FcIMU21e3+eQ5joyyO/cZYzTYAQG4l6pn7179y/+0fzaqrjLz4ZWQVYjGUGQoTBylLEX50eSo/TKr6xnC4KYH66OkfjVhr/h7MBnQ/VRW5GofiVNZRSck6BPUPSZChr1sOpT5NGy138zNzuI/x5c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2017 04:44:00.0149 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1931 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 3/4] ASoC: simple-card: add new simple_priv_to_card() macro X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current simple card driver is directly calling priv->snd_card everywhere, but it makes unreadable code. Let's use simple_priv_to_card() macro for it Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index a6a48f2..2c9deda 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -40,9 +40,10 @@ struct simple_card_data { struct snd_soc_dai_link *dai_link; }; -#define simple_priv_to_dev(priv) ((priv)->snd_card.dev) -#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i)) +#define simple_priv_to_card(priv) (&(priv)->snd_card) #define simple_priv_to_props(priv, i) ((priv)->dai_props + (i)) +#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev) +#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i)) #define DAI "sound-dai" #define CELL "#sound-dai-cells" @@ -323,6 +324,7 @@ static int asoc_simple_card_parse_aux_devs(struct device_node *node, { struct device *dev = simple_priv_to_dev(priv); struct device_node *aux_node; + struct snd_soc_card *card = simple_priv_to_card(priv); int i, n, len; if (!of_find_property(node, PREFIX "aux-devs", &len)) @@ -332,19 +334,19 @@ static int asoc_simple_card_parse_aux_devs(struct device_node *node, if (n <= 0) return -EINVAL; - priv->snd_card.aux_dev = devm_kzalloc(dev, - n * sizeof(*priv->snd_card.aux_dev), GFP_KERNEL); - if (!priv->snd_card.aux_dev) + card->aux_dev = devm_kzalloc(dev, + n * sizeof(*card->aux_dev), GFP_KERNEL); + if (!card->aux_dev) return -ENOMEM; for (i = 0; i < n; i++) { aux_node = of_parse_phandle(node, PREFIX "aux-devs", i); if (!aux_node) return -EINVAL; - priv->snd_card.aux_dev[i].codec_of_node = aux_node; + card->aux_dev[i].codec_of_node = aux_node; } - priv->snd_card.num_aux_devs = n; + card->num_aux_devs = n; return 0; } @@ -352,6 +354,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, struct simple_card_data *priv) { struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_card *card = simple_priv_to_card(priv); struct device_node *dai_link; int ret; @@ -362,7 +365,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, /* The off-codec widgets */ if (of_property_read_bool(node, PREFIX "widgets")) { - ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card, + ret = snd_soc_of_parse_audio_simple_widgets(card, PREFIX "widgets"); if (ret) goto card_parse_end; @@ -370,7 +373,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, /* DAPM routes */ if (of_property_read_bool(node, PREFIX "routing")) { - ret = snd_soc_of_parse_audio_routing(&priv->snd_card, + ret = snd_soc_of_parse_audio_routing(card, PREFIX "routing"); if (ret) goto card_parse_end; @@ -401,7 +404,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, goto card_parse_end; } - ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX); + ret = asoc_simple_card_parse_card_name(card, PREFIX); if (ret < 0) goto card_parse_end; @@ -420,6 +423,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) struct simple_dai_props *dai_props; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; + struct snd_soc_card *card; int num, ret; /* Get the number of DAI links */ @@ -442,10 +446,11 @@ static int asoc_simple_card_probe(struct platform_device *pdev) priv->dai_link = dai_link; /* Init snd_soc_card */ - priv->snd_card.owner = THIS_MODULE; - priv->snd_card.dev = dev; - priv->snd_card.dai_link = priv->dai_link; - priv->snd_card.num_links = num; + card = simple_priv_to_card(priv); + card->owner = THIS_MODULE; + card->dev = dev; + card->dai_link = priv->dai_link; + card->num_links = num; if (np && of_device_is_available(np)) { @@ -474,7 +479,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) return -EINVAL; } - priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name; + card->name = (cinfo->card) ? cinfo->card : cinfo->name; dai_link->name = cinfo->name; dai_link->stream_name = cinfo->name; dai_link->platform_name = cinfo->platform; @@ -489,13 +494,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev) sizeof(priv->dai_props->codec_dai)); } - snd_soc_card_set_drvdata(&priv->snd_card, priv); + snd_soc_card_set_drvdata(card, priv); - ret = devm_snd_soc_register_card(dev, &priv->snd_card); + ret = devm_snd_soc_register_card(dev, card); if (ret >= 0) return ret; err: - asoc_simple_card_clean_reference(&priv->snd_card); + asoc_simple_card_clean_reference(card); return ret; }