From patchwork Wed Mar 15 04:44:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9624793 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 AC0DA60424 for ; Wed, 15 Mar 2017 04:45:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A219A284BC for ; Wed, 15 Mar 2017 04:45:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 944252856F; Wed, 15 Mar 2017 04:45:06 +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 9D53E284BC for ; Wed, 15 Mar 2017 04:45:05 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A90A7266F7A; Wed, 15 Mar 2017 05:44:58 +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 A9213266F78; Wed, 15 Mar 2017 05:44:57 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 6DC33266F37 for ; Wed, 15 Mar 2017 05:44:20 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie3.idc.renesas.com with ESMTP; 15 Mar 2017 13:44:18 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id EC41B69541; Wed, 15 Mar 2017 13:44:18 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id D637928076; Wed, 15 Mar 2017 13:44:18 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id D075128070; Wed, 15 Mar 2017 13:44:18 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id PAE13601; Wed, 15 Mar 2017 13:44:18 +0900 X-IronPort-AV: E=Sophos;i="5.36,167,1486393200"; d="scan'208";a="237548371" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 15 Mar 2017 13:44:18 +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=prId9pj3f4TEtXm6O3Zm/HWTfi6XXdfFpDkQzogsuK8=; b=OA0q+dAS4Iw3S1FRyMy7YtZ4iNdiinW4FN81REFQ3HbhKVAjljpRfpGtqMAWL3lTcZIhfz6omBxX2+GrTrH+ZgqVOThuV5JoORZgk65kx1EdBBljsddvGe2wPHp6eoTF3o+t/Z/azajk1hofHTr3Nq7GVzjUKhVXIqkL0YlZ9pQ= 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 KL1PR0601MB1927.apcprd06.prod.outlook.com (2603:1096:802:9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Wed, 15 Mar 2017 04:44:16 +0000 Message-ID: <87h92vcfu7.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:16 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0118.jpnprd01.prod.outlook.com (2603:1096:602::12) To KL1PR0601MB1927.apcprd06.prod.outlook.com (2603:1096:802:9::17) X-MS-Office365-Filtering-Correlation-Id: f4a05756-2437-40d1-deb5-08d46b5df064 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:KL1PR0601MB1927; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1927; 3:aESIPITIrwfYftZI4w336WGTeELO1V+/Vo0tmqO5j7XMDMZGyWK/gFYrvvLwzQDHQ4yYcngVqwiAfHKCKRHEbJtySbghZ65BsHrWYXL9lzM4YfFpoHpVXuol3H1vLYFYez5gY+3bI2i52QbeSNONtR+Qc6r50BrAhepwBm2xq+mVS4oxyN+yLjAUWHznGOWEF7X4NJ1VQ5R6CQ7T1zPfqqxU6CB2TW4YEazgRViYBtXtGdx5jHGRTKblU1TZog7qscEaHc87S2YEyrWQgok71aHU70DtRMWqHCTxBSvif/Y=; 25:Ry/M91J1JE9sKAvKNxvsIhNjHQEykMgvfMKkoS0PNF1lZXeruBDKtKnJeJ/CvbrvhnlCe/TN/Qj6Xe6UbGvyitEI/UwTTf6rwGX4Bpmkxq/yA/3pRX9cdX8emCgZ+EZpB57OrcW2zFN89nRYLNDu+4ANvmc2jxB6/ZxkgSx9+5PM1LXgXVGuaR64mZFkyaUNCbzWRBj1AKhl6eH80Kq7KTnN53fOkpaDtIoizsrU7NoyaQt+YCWc5LbHq9bDd8g6BzcHG7sjF8HpDbTxctzk5ZfTiZ5/JeoAzlH2ouNCnbIs3HgyL7/I6ukVxfJJWdGp0ahspEtMAqwWog7U3GzY9sBjzmAuJnAYsJdp9XzcGj43isi88u58kP9zeKvqVJl8xT+TYFhpFzeCrUfF6dLwfMTOJeVIEAIs7RCpANJjGCi6QcRqwBrkdW5bGA6JNWUZgfzA4HXeBC58MdreauPL2A== X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1927; 31:RatvTvgTo1XnxyDa1szz7hYyFsOLnGEw9KFOPTsnHwDWDw2iJGB2ugswTR7YLoZHZue6l6+IPBfVOcK/Cff093os+DTkeSTXLt962kaBV7JIiMXZvc/2aW3PNQj/dintmpVg/wJm1QrT6xpqeIbv9TBBS2Tg+kIAYPadcbiX7S58HODtjkFok9Mut4g2Ph1dpB9qGXYZUEXx1IACcfqRE518s2b9DjxtqlhcIEP6A6VwiQCSc00bmuuhJ/PzVCqL; 20:wR3kucTWQVj7gqv4G5r7ZoMIV+RO5PKJFEc971ISneCUJdjQJkxmDnoD3uO/JMTEClLYbzncx9snevtBMhiOAk55NC454QmB/zKBnKcxSxmzp1oN6zOL2zV55V+yQxehVBT9PYObYEtTdInEKL2qowJ+2FZ3jVvF/K401aZjYc4dxGWq4bILJuXyy77TKGlXkFd7RT4tarD2PpwmSyFmKIZI2U5MwdH2ZQo4UsCTZRdHGA2QVM5H0J84tckPXJfCBBLt/UsegJ4GM+fGqTIc4kO35nKEIoLHJUeCA4S7RtpHV4MYZ62yJ86Pg7j9p2GmohxuEX9+/CNvQ/qAGhlMO3VWASiu1RiNe2VGb+sCybHRPsdRFPsWtNdBzsUqjiPv192O0l0CdLVfwjCAKDl/UoZoI/VnVAovnV3nT1LyTGH9pzsowUZvqoG2oTPN4QljPU4+SmFvV/04A3NUEZUnw0llg9N1fTybn5N5rtNKdrCBIczrnFGKWm0aCHiszBmd X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:KL1PR0601MB1927; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1927; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1927; 4:nFiyfKnurnGxFqcr4Wwdj0iezTaL6G9VaTc4JSAuo1iVHujGXXTfmKWPvh71i5yCEQ6MvvE04janCT9R55jBngt7+MABjUZfEMDnWfWMuYKwGYfDNcXNsk4lKc2NWC4Xm/kPReFaA0E97XBoKOD+N2ZX/AjlVPvyubYJEXhT68JdcCx4AQ3pXsjvSHr3yKftED/roHrhhTE4CORI4f4+i/zZg+cF/hzktvfDNzUJnFtZNV//3fjZIK7IqGPD9rCRx1f7TPvAWrQPIaO0BkZj/LUEHOnCnuj82gCwmds5/P+6cTQxFLUyCuczmpErbFPQgJuw7oUAMjMAVX2Gzs1dDe/5dH/Y0a9xgxbk2qwSnkk0ZvhQHqY5GG5/rQXBbq4y65YjOCCGJ21xGmsECJML+Sykk2Lx0wRpMR5HzUmryv2SBwQkaRsmQF2P9EzcddJKB10TAZs1D5cAENcszBE9qykjJnhP2xjzwYGehY2lmFKNNOVC5enaX3kSGqSGx/gc5aHJbqn7whPw4rIu8Z6huTaDWw+5CONDIPgiBMsvHmrF76B2pDJwDaZtz5wGxFT3q0Dn2ZZ25g+/wd+Kh7ssRJEafliLh2jSqp9AoCiJZtgPZx1qTinCpK9mH8XDOiFQ X-Forefront-PRVS: 02475B2A01 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39840400002)(39850400002)(39410400002)(39860400002)(39450400003)(53416004)(33646002)(42186005)(230783001)(76176999)(54356999)(305945005)(7736002)(189998001)(86362001)(2906002)(4326008)(38730400002)(66066001)(50986999)(110136004)(46406003)(6486002)(3846002)(6116002)(50466002)(54906002)(23726003)(8676002)(6916009)(5660300001)(2950100002)(53936002)(36756003)(81166006)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1927; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1927; 23:RfA4qOTDgG9nhxvvaulad0SYJ9elEgGdOCmRB7i?= =?us-ascii?Q?RBep3H1eeK1OkjR9RVPGY9TNcLOePJMir1OeitRu/tiFv9HBadYQAGipDXXz?= =?us-ascii?Q?arWDGvJCRAOthuV11YGkoEUshMx35IaDBnopupe2TcV3Ms5H+exclNz/1NCf?= =?us-ascii?Q?FN63hL5tPQ8rB7cGLFaTv+9AsJootjLZgZvVN9Zl51tE+Mc85UBSlsbwEBXO?= =?us-ascii?Q?pFapMuxgO5akgbi6V+pIzmcukpFVGapNYTNeJlJP+O7Ar5mo+u0awKYO+KPO?= =?us-ascii?Q?B9ezjJXEDhHJ1ETa3E1/k8UV1ZRukmbOFz3UC2ogGdLMUkroeHOxjRs0JkJe?= =?us-ascii?Q?WMAHLLFsJwPuylpYEoR2GTRtxyCkoXNFpHg3jbEHNN7T1VA/xRZGlvhP7DNG?= =?us-ascii?Q?vWee7JM66A8neHUAMkDpUXDO2tgljDg9ZncFS917xO3APvuZJHc6sq5O9zIO?= =?us-ascii?Q?311xaPdbXR57ZgOz1t4s7mloJLGqHvCzIW01iFH1hDTR0r46hThVsYCsSFj7?= =?us-ascii?Q?6SwvvlkBRqQYAhAoKEaXsshPDtXa9dQXnHq4tSzk2Jd1ho8EH/vbb/WJc0Ay?= =?us-ascii?Q?ezgrmPZzDQPI3c3X+FJZgpAa6nb/mY7y45j5Z7Oufc1NQrM95K7dzwlGMK8L?= =?us-ascii?Q?UMzK8twC6o+IVCCav2r+qQhW772kYQlMAFpjlkZmxaFVhi3SzGnTb6+IcEST?= =?us-ascii?Q?IKw2cRuhdmzy9qj5wGmFtjnGuPabW6eI6q9TmfvKFBjGN1Jcy/5F0NcFDnb0?= =?us-ascii?Q?D9AbQBt8uPxglGQfCX4xeEUTq6F10qD8arn1sovFYWHHTEKMygOdFxrj9Xts?= =?us-ascii?Q?lx7b1xj28eEvYDmzF+18JH/tR1oVrXRZfBY+PU5DN/eYURPeq0f8ep5AnPHI?= =?us-ascii?Q?xpPNrgXYYhQjXMvQBWJBZqkp6AMTiehRTzXLWOribsSh3f57LK7tvy4C8a0C?= =?us-ascii?Q?q+FmocwXFpeaaIQDjLAxqYGcrZH27ASgWNTHh4LUN0wSvIhR9wg5kqAkEV8h?= =?us-ascii?Q?FIu0=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1927; 6:yUsnrwCO+RmEsd7eejpEd28JETZ3xuhWh2W0vzD9N41ve0GvvJxwJsw5Jw4FTSqEQl80NFXpTGXZsfhbSRylVGboYRaEYnRua11C5oRBb2PkR678u1IhQf8XI1xxGmy+TSPD9fPIGCKdfFik06OAE5IETb9jn1uiCm19pjrIpskOXItcOYETCTkWjBLz0iQmdeoKmCrBEISSGU6S99ZW5oipmzUxu+TFJApada7MakujbWPB+otKJj4tRHEBoQ4A0t0YZDLv6IeGs3Fs1NJVMzovRNXXTMnMrd7Lz4KAACDSyGl33EZ0rMM+P1BTPqhwWV4bmJKeQTfOfMxF88aSmpcEYVCsRhU6gQv17Pc7Q5mxuW5jEsTfRoZ/Vn1XbFNBaX6xArU/6ofI+BDkBOi830IKZzxrlaBAsNAYkNu7DJc=; 5:jM0x5nJ9tiG9ZW7Lrd9qgDLUyMYRgMaz+kpv/tP1BSB8glqxEVC6JhERmiEwUwP+duqJaacm+87SEErZRud9zH5z2j4l7gtaWuAMw7V2LCaS69ocuYOKrc/M1eCtwZteppvfFRsj/u99AKqTgqw4Jg==; 24:B2cQfeaJsaB20sbOpWQWzovCpV9FlK8Qa7IUPC/tENVhSUzMx7fNI8lETWn25l2leIhwjtvvvl7CbIeFZtEQHAzXdneDqr77hxXXnGIVS+0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1927; 7:IDk4Ggnk0YECvQ7vsKHkUYvYoNVJLYRtIY03rpofJzj+IVbcXqq5H5WV9EFZ9rb99vXgSVmip9s3O3Q8IMyLqFNYq7MJOZ5qm2yXXVz9LkbYJ/v3oPrhDxv7BWaQ5IFIWfKNUClTiOtzlfRgMwgm+o3MwGwTL8n51X8CrbayeehhqOgMAmQFtQySwpdCUqWtK1k0ZNUfvQN8IuLiSZOBLC4x/VtDKZSljxxdA0Nz99MXvyeLZD90V56c4l+bluRFdKQcydLNLwYSYSGMPJw0/2w7eSsyrPFcv+YeFR5tFRkCcqJ1MLTVyT5MP6i018wh3dIy4cbKGF/JG1cDSKp3Lw==; 20:IUwAyC/hkh7W+RWb20K6XG9tvog4xGcPo+No2plFTRtz+e1RZYWkY0xJQ+OhnM3yxRcdZe82SkqHTGF+JH/LSnQSfY3rIWqTno4ElWHtujYkXE1gpYGHPWD3Z4yxJ+H8it8dVPnz56abtSiCh9NChIOVRNl5Ugt5vSLa/Q49X00= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2017 04:44:16.9261 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1927 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 4/4] ASoC: simple-scu-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-scu-card.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 420b1c5..dcbcab2 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -31,9 +31,10 @@ struct simple_card_data { u32 convert_channels; }; -#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" @@ -109,6 +110,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, struct device *dev = simple_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx); struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx); + struct snd_soc_card *card = simple_priv_to_card(priv); int ret; if (is_fe) { @@ -163,7 +165,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, if (ret < 0) return ret; - snd_soc_of_parse_audio_prefix(&priv->snd_card, + snd_soc_of_parse_audio_prefix(card, &priv->codec_conf, dai_link->codec_of_node, PREFIX "prefix"); @@ -201,6 +203,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, { struct device *dev = simple_priv_to_dev(priv); struct device_node *np; + struct snd_soc_card *card = simple_priv_to_card(priv); unsigned int daifmt = 0; bool is_fe; int ret, i; @@ -208,7 +211,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (!node) return -EINVAL; - ret = snd_soc_of_parse_audio_routing(&priv->snd_card, PREFIX "routing"); + ret = snd_soc_of_parse_audio_routing(card, PREFIX "routing"); if (ret < 0) return ret; @@ -239,12 +242,12 @@ static int asoc_simple_card_parse_of(struct device_node *node, i++; } - ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX); + ret = asoc_simple_card_parse_card_name(card, PREFIX); if (ret < 0) return ret; dev_dbg(dev, "New card: %s\n", - priv->snd_card.name ? priv->snd_card.name : ""); + card->name ? card->name : ""); dev_dbg(dev, "convert_rate %d\n", priv->convert_rate); dev_dbg(dev, "convert_channels %d\n", priv->convert_channels); @@ -256,6 +259,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) struct simple_card_data *priv; struct snd_soc_dai_link *dai_link; struct asoc_simple_dai *dai_props; + struct snd_soc_card *card; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; int num, ret; @@ -276,12 +280,13 @@ 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; - priv->snd_card.codec_conf = &priv->codec_conf; - priv->snd_card.num_configs = 1; + card = simple_priv_to_card(priv); + card->owner = THIS_MODULE; + card->dev = dev; + card->dai_link = priv->dai_link; + card->num_links = num; + card->codec_conf = &priv->codec_conf; + card->num_configs = 1; ret = asoc_simple_card_parse_of(np, priv); if (ret < 0) { @@ -290,13 +295,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev) goto err; } - 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; }