From patchwork Mon Aug 20 05:11:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10569919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF5445A4 for ; Mon, 20 Aug 2018 05:12:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEBF829226 for ; Mon, 20 Aug 2018 05:12:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC8CE29264; Mon, 20 Aug 2018 05:12:03 +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=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham 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 AA8D82925F for ; Mon, 20 Aug 2018 05:12:02 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7E519267813; Mon, 20 Aug 2018 07:12:01 +0200 (CEST) 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 B14FB267819; Mon, 20 Aug 2018 07:11:59 +0200 (CEST) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 53840267818 for ; Mon, 20 Aug 2018 07:11:55 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 20 Aug 2018 14:11:54 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id A293763B88; Mon, 20 Aug 2018 14:11:54 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,263,1531753200"; d="scan'208";a="288515848" Received: from mail-os2jpn01lp0144.outbound.protection.outlook.com (HELO JPN01-OS2-obe.outbound.protection.outlook.com) ([23.103.139.144]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 20 Aug 2018 14:11:54 +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:X-MS-Exchange-SenderADCheck; bh=aJ/dbSlqsjYtcg2SKI0xHiZHkOCOchMFsvXGpe2En5o=; b=a3w4GBcx0IITnfIeeF1USdhpMW9b8aS9cSrbL1BoymAX61ebW+VgaRe84N2Wm+ELHIQtzc1B/Bm1kiSRrpu9n2DTyS4OHV5c6bwN+q4WnvWGR8ifNAHo9L+JsLbJiWYRQAmGrrAsr5e8Q1ukAvHp202I3vjtNf2puH8ZPYdViaQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TY1PR01MB1867.jpnprd01.prod.outlook.com (2603:1096:403:2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.22; Mon, 20 Aug 2018 05:11:51 +0000 Message-ID: <874lfpvd9m.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown In-Reply-To: <878t51vdd3.wl-kuninori.morimoto.gx@renesas.com> References: <878t51vdd3.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 20 Aug 2018 05:11:51 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0145.jpnprd01.prod.outlook.com (2603:1096:404:7e::13) To TY1PR01MB1867.jpnprd01.prod.outlook.com (2603:1096:403:2::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4c81a93-c8ed-4e4a-b894-08d6065b705b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1867; X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 3:ZwKAo+xp16OsAx8X3VBlSw3as1fCZ2BR04yPdAhPoguCs9F358mi+/urh8oTebxEoXOrrq7tGCp8L1B+OeHvXVlKtwBUM5Ew7HwyJnzuQsZCJaVoIT/IXckg/8xTNwnTcU0WJelWV6rlLiC9voc1hc6rEAmAip5VbVvTL2586EzYuq7HPwRk4j/T42WUnlU1Z6tjLp/QiCjMXDdHDpUPB4Em45G0eVbBwPFf0oF8VxXgTMi6TWo6dCvIX8xSGjqO; 25:xRjfmuLWbg99k4w0PSGBVqR2e1SXR/G/idfh+vIPxnt/OhA4m3t4OAbbvKLuoxz5jNxUAhJ6Aa4FWv8Y2QZjE52RFLQzGjUPkunV1BkCVF1oy+9YuB0Jw3EFfMpTV0EXDkar58yBvoHvUDk2Q4bCmk68Q/G+vY0P5KVlBKyYJck+7+UQOQvlhOua9AjALuPMJ3udNWHBsOr4LJBF/xLBA2yP/gKSoqYU6/oCnuxdiK05r6ywi81TFVkAwmjaIPSMX4YOvLBZ4aRrEeBeho2IfPI6jSUQGkghE1tkkQ4NeibECoedsUc/32GfcM+SApGrtJoF/apx/sEghgx1mcXzvA==; 31:5D19kiC9pRrCWdGb+t7f+qJ17kGWjQJA2wtwmjYIpRcKc+2+sA5A5yxkGgtFIuNj5kkR3oT7N3xGlmff4wf+YvCqKlbX/MT0kBGELWErwblTP8QPV2dnxLNoKL4WNJNa6aC0s9Zx0hliysK4D0GAB1zujjRmUZQe837GBlOb4RF66PBk+FAr2p098Wn6jJ+DO0GLqSPPwtq3enPHYDQnJwCEE/75gU34XvWcDWbiIa0= X-MS-TrafficTypeDiagnostic: TY1PR01MB1867: X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 20:RuduLqPTOlfxGzijGuWZPMrrCPaRdrAb+yV3s0cXTpot6s6x4WrmcQhsG+/BJYcJKyeksg1uTMkNXQNv/Syrr3nQwOJSIwzSPVb5JConcOdFXd4i0dlanvchFBynbBR36YtXO8N1Jq8zUZip1YkA2hjEJgdZ3l5sCD+TEvpLljF/UDsv71jFWSGhqzubfa8GZazl9mpsodhessux4yfgdpKmC4qR98ilTzLP+eQ1JZD83m5LFQq2Lw2y1rzcCyjpjtxQMxB77GPB2gwTW2ZjoCPL3Ct8FPnOzYmeYyqMi2WdpIJ4yYScl/YmZOv2Hqu0cdZPpqI5VaI7cxKvM4B28izly8yYw13mnCj+LQSCkzICS3cqhUSeMCKsS5FvQ23Ewf0Qz5DQaeD3xG52UAwMxIUy7wvp2bZ8IBpZuzf0mlwFC6eEawXb3oY+eKHz8TA9+00N1YF8SM+makdGbDqnuSFGglr4Z6lQBdQ5KcGAWwf/LynBcB1LNFOi6ob6LShv; 4:Nv419kTFXOmuKsyRBpWiMlruaOfWxRY3IWzQp4ZLNtfcCEL0Cz7BhcEMqLz24DhhQSV/c4mcUa/rO2/hi7dI7OA14CfzoRSCIvBsI2hTJ8bQUdjwwHwGlh5al0zDUdo8flE2XBAmsSycgee/961K9uFKaZVOhPOc8jd+Zmb9ULclGS5uhrnCqLkBMzo6iPBxvkbskdbrRrDQmWwHnwI8dD2bsqXzFOIhoh0EWZJxuXIQfOxpD6QDZmi3y8rg0wOm2X4SodRESx00xub3LB4xXQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(20161123564045)(201708071742011)(7699016); SRVR:TY1PR01MB1867; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1867; X-Forefront-PRVS: 0770F75EA9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(376002)(396003)(346002)(189003)(199004)(97736004)(26005)(7736002)(53416004)(16526019)(186003)(66066001)(47776003)(58126008)(16586007)(316002)(476003)(81166006)(81156014)(50466002)(305945005)(386003)(105586002)(11346002)(446003)(8676002)(486006)(2616005)(106356001)(956004)(86362001)(53936002)(6486002)(3846002)(5660300001)(23726003)(6116002)(2906002)(14444005)(25786009)(69596002)(4326008)(478600001)(6916009)(8936002)(36756003)(76176011)(52116002)(68736007)(7696005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1867; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TY1PR01MB1867; 23:Ko3s99QXwFh0X7uH21IjSeGWEkPBWql5nQwd4MDPP?= e9PiMOXkhbJiQma5rnuHOXdew9TC65cPWg2GPGdRhudgSmRjIMn4d4EFRuiSAfdb+n/HrHbjZGixI4i90ghtJRjY4Ya8YJZPQk2UHp+zzYYV1UbsZM5YVO97nfhyIflFtxO2lH96f0VaHcZfD7mmNzn7esczHAzyCimfLQz7l2Gtm10ljK7DNgSwyVOV84wUhpyousQgNpvX3yhxQdHFAMWUrzCVeyinjiGSp3anNZrfCXRXVV4/i597+3QFG8YsN84onvU2I66kUk2kAz+q3e9JFVzyloX2MN01dKVGxDWVKI4oUJMq4OWI9E9yZfNJcFtVQivrzSm3xtAZdGhvSc6NUrfBI41fTz8G+H80oy2nZxekz8F4APCFe9m2t3pXp+Ms9plrJU6AUfDACWVjs+pFReVWwrexuTPaxJKH8LAofonuIAT3MlMvgmasFkaXNJWgdQXnRTpVk0/DMqIckQK4J1Jen9dxWGY7rFHveRKvyfGr0Zb+AQm1QJTHDnZVneAq516Pl7+Qq8Q3Wo8VpUMFP/KAMtEjzwKa/CDGixtzRr2GzwFPH+dx2logzLHX1ya7W0mnlp6iBXqkmJNZOxkMwKbS5HAxFSamOk2UGwmYGUotncQaOcOK7YJA+lF5z1emoeBwWOxf9U1SxgG/aQkRFGA6BqiltfLcvOvzXKU/uXmbT1Vj5DLetcTqYu0RG4vadzk2XVzkf3Kwwlg2Fo0TxlfLl2ZohD3hhm6P74d33/W4bfJlbjGNbDU+3PYj1STN8BDtlLayyHcysTzucAULOS11imwSH3t6ukVbxq9iwTUbiBgAhxBov80O0HjI8noQ+m9pPIv3HH6ND1w5HX5by9PUb1DFKmG5mx65YlXCXcjMWtAenWBx0JkWjYCH1KiuW7SpSllLvdRcSJ3MeY/6QFIJxzshTHk4NPzU+q5mmNUma+/odd7pcvv1Zso+iAK2VULCGbtoX1jnr3j+kX/tJMbkZ8oS7dUXXAiwKouUn7OQb9UxhXiBgJYabGOPIsBNtYMxpBHZo6m2/+NNp1ckL5eItWkrxAQrT1nCymeaQxz37oTNxJeVxEpNuEGwN4CEW49Sm4oxe4emFl5LuekdehltkP/kn0BCVthmpKS+8yBxFGmiT8IYYimUVl0EKIffVaI58uVkrb/SEleqm2K X-Microsoft-Antispam-Message-Info: MWNuSQ+OE60gANJB7zjZFg4KdZaw9BYFisIA8SzilZ9pZU4gahcWFS3dJqdhZ7DIcwyZ6YnJuhEIU05/VAcAoI2FTP4m1Vqk2Znyb2fgpW6dUupBsuXzxkWh2DidsHRlJhW5RoH2toFZsAPf1EExTmgwl2ihleeLoXmQ66TvhePAhCslaUKWt0YWtwAJPwuDp2KEmVmaaPEtX6uZxI1PZGvUa6p52d+zR9Q6wASJfICcxUhLQurMA3/BPyCNJRXSpuk2O/argpIqzksWYgIMPYZOM0h225jgptQ0vKu9Yw5XPMzBnA0bf7/Tok5iPE2xTpuUYtTjvMSH4Hi3Yd2wFdtCRGzXA2Ef5NpK9gapyAo= X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 6:8cvDcmK2xDL90iekWUbqon/bJdEajUqcNbOvPrd5uY5KyeqDEJ9JrkIRxQ/7U6xvO4PwXMNE5sQ0rTuDUR6+ZvQQlmrqIqtYZPe1GtxoXJrZ/xxaMjtbkFVe6q80vbNndn8gVX09IrTcvrJXcpJ3r976AvWTL+EEkhb54/JxvdUxiPa0ZXtxYrmfcIke6GVZFDBfy9qePfanfc7V7Ei+9LbYhLOjpQBF0bsya553Mt4brZgax29pkUXm1m+iGSGq2/FtZTqSHCKr38twDmWLe0r2oGEbCY0+UnriIjuZKo8webe6UaOfuFS5zy+IRBITFTfpuEs7Tg4il4b+F4UifLh4nEwHMIg5ySHgKXYJBYwA5UOkWLcSwMK8LReQuZJ3v3ncxNVj1J2YwWztDOn+2aWSslCS59heb9av83yQHrOuhkDnrvcDkWfbFN6VWMBGNSHbw5O32rXThJK43LZokg==; 5:qKUGeEcl/4DEIcWczREbG8tiLt6NBPq0KQO2Rakx350/KJUJdRPwwyNlZTFOF6bB/1jqgOu98ispYyXglzLI3SYlAwHsPu1G/H0L8eyefE5tAbZSu0GqKZA7oXNVdnQhpSLfC5HRchiYjckdnnS8bh0GdAToMjO/Sux01Fp2R3c=; 7:nNIrUTXa7/pkQo4sAif3E20cT9+ADe2gFsOqqio3eNsWvoWYrqzSdZi7uysceUqUjdHatIQBZJGxp5N83SEWkgoa+inpwgpHdWEQxkL/A7o/RsdQ2LIYv3lZUHZznGy+6I3KyCSPzKYFrP1kp5VBwF2govregu3lsAYu+JtuJD/RVnK1hUwdnHdUQSJKXqasdiTrXXKViXsZ9X9coQsv37WKk5AyyQNlRnHHN5rwxi8WUIVFPBMfKqJM47ff/sUe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TY1PR01MB1867; 20:Yj096j4PW7TfI33A34IAcneUjdL3UkZItKbI3VAC6hBzGr/hbTPqt2IKm8U4IDM4xQ8OmIv77xNMGFJqooHabEhMeLiUKbMGyfDBYBMO8LTUcsdZ4bCkXWgCzH3ZGt/IgPJsaYcj1e//7Jdev8ZX9yQjmIPzv4uHu7HjYquTI/0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2018 05:11:51.5884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4c81a93-c8ed-4e4a-b894-08d6065b705b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1867 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH 03/15][RFC] ASoC: simple-scu-card: use simple_dai_props 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 simple-card and simple-scu-card are very similar driver, but using different feature. Thus we are keeping synchronization on these 2 drivers style, because it is easy to confirm / check. Current big difference between these 2 drivers are "dai_props" on simple_card_data (= priv). It will be difficult to keep synchronize if we will add new feature on simple-scu-card. Thus, this patch synchronize it. [simple] struct simple_card_data { ... struct simple_dai_props { ... } *dai_props; ... }; [simple scu] struct simple_card_data { ... struct asoc_simple_dai *dai_props; ... }; Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-scu-card.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index 16a83bc..09be02e 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -22,7 +22,9 @@ struct simple_card_data { struct snd_soc_card snd_card; struct snd_soc_codec_conf codec_conf; - struct asoc_simple_dai *dai_props; + struct simple_dai_props { + struct asoc_simple_dai dai; + } *dai_props; struct snd_soc_dai_link *dai_link; struct asoc_simple_card_data adata; }; @@ -40,20 +42,20 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card); - struct asoc_simple_dai *dai_props = + struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); - return asoc_simple_card_clk_enable(dai_props); + return asoc_simple_card_clk_enable(&dai_props->dai); } static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card); - struct asoc_simple_dai *dai_props = + struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); - asoc_simple_card_clk_disable(dai_props); + asoc_simple_card_clk_disable(&dai_props->dai); } static const struct snd_soc_ops asoc_simple_card_ops = { @@ -66,7 +68,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *dai; struct snd_soc_dai_link *dai_link; - struct asoc_simple_dai *dai_props; + struct simple_dai_props *dai_props; int num = rtd->num; dai_link = simple_priv_to_link(priv, num); @@ -75,7 +77,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) rtd->cpu_dai : rtd->codec_dai; - return asoc_simple_card_init_dai(dai, dai_props); + return asoc_simple_card_init_dai(dai, &dai_props->dai); } static int asoc_simple_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, @@ -95,7 +97,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 simple_dai_props *dai_props = simple_priv_to_props(priv, idx); struct snd_soc_card *card = simple_priv_to_card(priv); int ret; @@ -116,7 +118,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, if (ret) return ret; - ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, dai_props); + ret = asoc_simple_card_parse_clk_cpu(dev, np, dai_link, &dai_props->dai); if (ret < 0) return ret; @@ -141,7 +143,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, if (ret < 0) return ret; - ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, dai_props); + ret = asoc_simple_card_parse_clk_codec(dev, np, dai_link, &dai_props->dai); if (ret < 0) return ret; @@ -157,7 +159,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, PREFIX "prefix"); } - ret = asoc_simple_card_of_parse_tdm(np, dai_props); + ret = asoc_simple_card_of_parse_tdm(np, &dai_props->dai); if (ret) return ret; @@ -230,7 +232,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 simple_dai_props *dai_props; struct snd_soc_card *card; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node;