From patchwork Mon Jan 29 04:42:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189235 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 5525060388 for ; Mon, 29 Jan 2018 05:05:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 436EB2018E for ; Mon, 29 Jan 2018 05:05:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35BBD2465D; Mon, 29 Jan 2018 05:05:57 +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 230392018E for ; Mon, 29 Jan 2018 05:05:56 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id ED146268026; Mon, 29 Jan 2018 06:03:00 +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 1F94F2683FB; Mon, 29 Jan 2018 06:02:59 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 09C4C26802A for ; Mon, 29 Jan 2018 05:42:53 +0100 (CET) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 29 Jan 2018 13:42:52 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 2D4CF76BDB; Mon, 29 Jan 2018 13:42:52 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270918115" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:42:51 +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=yWQ5BfE9RgS9dypDJOT/cnpulb05pABY2Ls+ILu+KVg=; b=S3e0BhgzwdJO+qOtEMbjdmvq9uIlo4EERc87d9E4/7UgXiWttnhlnFF9JpTCvZgFR8OFlr9tKm12LlJp1voHRFv/IRk+CKxvrDWUNi6bu75l4+GYc2OGHRr4bfIPZOzwjJmc3209ukzWVPZJUJw3mrhMWt/xmPIvfETQE+zAiI0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by SG2PR0601MB1887.apcprd06.prod.outlook.com (2603:1096:3:9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 04:42:49 +0000 Message-ID: <87fu6puvil.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: <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 04:42:49 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0080.jpnprd01.prod.outlook.com (2603:1096:402:c::16) To SG2PR0601MB1887.apcprd06.prod.outlook.com (2603:1096:3:9::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e9200702-c023-46f5-d621-08d566d2c088 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1887; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 3:XbEm1zk7C8oeZfgp9d4fdDQA1MDxNHDZ1Fw45vIHpowLVelKB9x/w2uBilleUE6jqksqme6/aBsro38VVcAd78wsqL5pBo3oBUviMA8ts+ylyeWpCklqQVnADTmuWf8V0nsbKSyuxiUlImywUAp9zv+hLSxvd84iRuo4SPE6FEkPnDI8b16GYJ9HxIexWSwGLjPmZRV9yAOiX86atYLoehwGlrfSsOMsqtD9Vi8Pnfa6BQ0uCF7bE6yIGaYrbFDK; 25:KeUH8KGACz1oG/ig+kLJcXwwGpmpK5BVgoH9tG42WHhSGZwG2galMf0iInxy76hpStm1QoT0vGTfUGzFmA16wQXXmHMZgVBqe780rCIliVCXeSywebcbAtnAJoNDCtsQDDNCvq1I0+G3g1gGZljOveVnCrRthR5mNSY/q4+PsLST9va7YQg0jsUz3LqkrYXmCwVO6Kk8XftSDDfeodptRNx79hrawNKP0MKVENISp+EYiIkIdUfgjXSttL9et2c5Xmmushe4XU0Dh0l50GFz3gVXjdD9cFkHWlNjf7VGD1dc1CMXc1gT+nj2UTNUC/yVsOjbB5L7U2GfmLmy8pi4VQ==; 31:Eagt29YutAArJVRLnIrZfHA8PNFBYUg18TPZEb4Dh0OTSJ5F9lrVqZ3V2yCtoxdWiAL4COFu8ouvcQCYkdnwDGEJAxGv0JXzfyiZXv0aziipIpsmjYUB7wHP1IwFqqz/YWHbaRJYusXXbzNefCOG7vr/PHbVo1Ta3hXilJeZ4f6LB/Am1IIF70EXCmBWYEV2gpMKW4bC1jCEjr7ufnoD7kSGm3Y6p9fxf00aF4TbAiE= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1887: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 20:I3s/3hdoqvM6+4eEOOswigi8T+NWoQEOt9j4WmVctnljyveG1ApMVYxnkYZr8qjNLrWUPsGbBjYYfCeKIt+MtI2Ubar14Opf9RvFCeA9i/gHCquZ07zsMHMRuYD+xjuswRvuTvnnXR6QGN+IIylDp/N2lRSidKLN80HFqWhREz9BMzdlbmidQOri3mrQLUauoRdo90O3C5Q5rn6im5YEJR4FearsJbd25b4+6FbfbFvczZ5WeGbFZi2xrjeZ9F+m3UE5OgL7loXi+N0h2evLdqsgjorbbsrSiLl2fZFOB2+UEsH/34roMqiQ6fUCC7qpAZz+/qKIOJGI00sl7Ya+4rG9lzwhI4QIgvX4QRYxybC/b46lJ1L34m875gEe4vQNOpSKhoYgtgAZgo8N7xBz+7a4BCjcbU5UF+J1N/Na+VHUthkrcrtLeq70g26JIasZe0QXtipV/ux/dhopQTLeOvSOI699pzvnp8mYSbzHAgiHc1GzKK/Gko8W7xCCSviS; 4:ROgReCBxLz/mQ0PoliREZ76HTEY6uop5V6ohwaLUBOnfoX69NOxcaIhpyU4xq88dZzyheVF9YR7LVMAngXVKuflQyVdh7Bm8upT+fEGpIQ61TQO3O/ZH3jqxaZwkXo6VuBG1eN196UlL46ppyq6TSALd56XRYpvIEMJog4VX0epY77Np0Tu+QtTPnT3dTAsHMjIUCxu56QNc8e21DhdEPOpsBOs+MSr/r1zbUaebuNLY6ZkJAb0ebDgmWF0aAIsPpxX5LPYP3Rsn69sHAqYgRVDUWJNtNpjx3iaRo0LgPrdFNnFgVJH8IZTOQr3ev2S9 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(944501161)(93006095)(93001095)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:SG2PR0601MB1887; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1887; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(39380400002)(396003)(366004)(199004)(189003)(105586002)(97736004)(69596002)(58126008)(50466002)(36756003)(83506002)(6116002)(3846002)(23726003)(316002)(86362001)(305945005)(7736002)(16586007)(106356001)(2906002)(59450400001)(76176011)(52116002)(68736007)(478600001)(25786009)(81156014)(81166006)(8676002)(386003)(6486002)(26005)(16526019)(8936002)(47776003)(6916009)(2950100002)(186003)(5660300001)(53416004)(53936002)(7696005)(66066001)(4326008)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1887; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1887; 23:yM9s0trUqLgkxUFQUtNDW9Y+H44U2VkbrUyPYdx?= =?us-ascii?Q?egPxupY64z7v+deuswswhrky6k+Swx4rGNPKmyEknCN0omo5HLFhQnyxSw6D?= =?us-ascii?Q?It04jfubSmFsLXZE/jeQEUR0yuy6Gcr7i9Pt/6ea012qd1K9wwwQOk5OdvnU?= =?us-ascii?Q?sqEvpBQPvE+dfpbuJ9tfo1MDLED6cpgPR6tAjC4D8Ppu8OBfVjS0ppMhU23F?= =?us-ascii?Q?bR0sM5+vGIZQq9i+ovllW9vu2lsYg7gkmADWhNCjtkZI+F6YOS4LpH1qX+9N?= =?us-ascii?Q?aO+BelmJsaU2qF+SitoiJPi0/qFxH8T+mT/XZfHyQ0oiU1wFPcKeeAEiS17R?= =?us-ascii?Q?IKjwp0s0P/6lUPBh0ec7cYtx2uhhpaVmwMYz2OJzdPZNUDkp/Jr2Y746384a?= =?us-ascii?Q?wY/tFYdA2Jr/tl5gf4YgLuwDBpF4bfj7b1stIOtczSDx8V+MBe5VIAygVJpu?= =?us-ascii?Q?IsayGdXoCp5ZDuRBXjLB4x62nsMQ+eg9ll64NdYJxykug7WmwXg/As/nEk56?= =?us-ascii?Q?oj3HcwgjsK5ipXO0CK8vqian+bHSEx257FJrBdo1qbSIATCbAQwZvKStI6m2?= =?us-ascii?Q?IKBM/tzycZy8i4O/huemfkEIfpeeJYNUV28pcoC4gfXEj3okrqSnobn41Sjv?= =?us-ascii?Q?LqndsnxWHqxApAf03HBo6DMHJlQD7DMppwTkXrk3ByDblkkA4IekNosd2yos?= =?us-ascii?Q?dIzjdmlYIZL8qot8hj8fXjOupW8APhmwu/cSTgmXXkUGIaRVrnEH230+BA68?= =?us-ascii?Q?VugExKrtMg41n49iMiTpvshgl9Ghv8nhmP61EgTawbXaZ0f+2crkok10m2FL?= =?us-ascii?Q?KEzpPN3HlVniW9fYXqq7Q70ZexIlOqiu+70fEbzL2sJvObQgUziChGhXunyS?= =?us-ascii?Q?r6GmVSBihCL8ObE9VRzjFbjE+94RfJYHWfkIKPgZlu9alRtVtkTDOfrAxWKw?= =?us-ascii?Q?12MORuunDtfFEDaTMGx4pkJfplT4qdO7WkanCmTYMkcvpmIn41i8j7gJbiFt?= =?us-ascii?Q?HT+1in+684TyxmSXiPEPvKj93KnbB9f9B/jW43rV07gS42tQKhKKFic55uT/?= =?us-ascii?Q?n4YnN+Ib7GWd6k9rvaxOQPExpjY9JyjFzwp75jyh4adSMupaYs9dYR+/J45m?= =?us-ascii?Q?gYtLuBl5KhMNf8Yqb5xkmbhqlYzUlCxBoVEUMDfhk4Cf3ymIi7ztVw304nS2?= =?us-ascii?Q?nbZylxbGz6tzAF3Q=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 6:O0USj9eWCGRJlf/NPhz2wUWqHM5HBrvbd2V87q6QqHZP9596q7hDBPUafj94hD9x2PMmACJz4MiiMSiXQDssLktEReCYJbknUNw8ZX8NefAnOiVf7i6kjgyGmfb8crU8MLh1n8xTmUJiQpQkmghfjZvv4m5p8WSR07Ah9QKaRgrrkOXsoEYkwYXVZQDvEEkhgRrdMES2Xd2dshZokh9GbOUxcLmIiquw7JBQOyj/OETF7ORyTJQoGbuq6E0x9rZtyap0yt1oBf1Zwd6BfiAr4L0Jq7entS/0aEtRu9snYp13CJbC9onEsBrRofmvS4GNjFP3wLzazQX/ExZGQTsl1L23MeIrV36VbpfzmoyBxI8=; 5:ywlkfzbcOempwr7kmEJJY8Q9sQ5lakujx7d5TtHL07/+T+3gerceh0cBsoKRRTgFI6Sorf6DTYsNkemvp1VotCcf+0U/bUIcAIQzhLbEuvkIRv1pwpQ2qSj9IVxb/N7nUFH54nhqmLiqZ+A46DxqIti2Ae4X53LB+njmpcWhV78=; 24:q+U/WapsSwrWcZIqUaKEub0z85GD6LkzDTva9WEfjJYE1IyyjJdtSUkuwdQiPJJcx8lcAq6ifxqAcf3mJnQooaBUmHh6cUtG40viUfsCdZE=; 7:aszZLNoDx1xyqGlnGQxwBuvISem4GHbjcmSeMZQvchYHZxeGFHPnkj5abk+4fjh4pT9BcaIHVbL2qnPBJ3VITCno+IRbEBlyiCNSDELcbzlZC4kBlPXmaVuugMsdJhtLcQFqpIf2OjnIfPfNzH3hu+Y8eofMDwognK7O5KHWp9O/TlggZ0egbul3mZ6W5WeeZS7PZwIMmcwf1sr09TBd4R4/5evN4bGAheBq9SJjk3RH7SAovEM1kuKC1shuKKdm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1887; 20:7S1nIGmIFolkWVs5kn8SxmTp9fO1vBMyB9cPON9IVDygSDkYD/wR6sYJ9e4GGstacGQn3RlZdPpOQFjvcHsy4n3+uW8tAUll6jf1zITVuCiqKISEhrSPARB6NGUsrV3DzaYfoaYvphQ52IJ6vD79Ha8xwZKUphdqMrc+2IDslQM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:42:49.8401 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e9200702-c023-46f5-d621-08d566d2c088 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1887 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 176/186] ASoC: cq93vc: replace codec to component 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 Now we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/cq93vc.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/cq93vc.c b/sound/soc/codecs/cq93vc.c index 3bf9365..3301861 100644 --- a/sound/soc/codecs/cq93vc.c +++ b/sound/soc/codecs/cq93vc.c @@ -45,7 +45,7 @@ static int cq93vc_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; u8 reg; if (mute) @@ -53,7 +53,7 @@ static int cq93vc_mute(struct snd_soc_dai *dai, int mute) else reg = 0; - snd_soc_update_bits(codec, DAVINCI_VC_REG09, DAVINCI_VC_REG09_MUTE, + snd_soc_component_update_bits(component, DAVINCI_VC_REG09, DAVINCI_VC_REG09_MUTE, reg); return 0; @@ -72,23 +72,23 @@ static int cq93vc_set_dai_sysclk(struct snd_soc_dai *codec_dai, return -EINVAL; } -static int cq93vc_set_bias_level(struct snd_soc_codec *codec, +static int cq93vc_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { switch (level) { case SND_SOC_BIAS_ON: - snd_soc_write(codec, DAVINCI_VC_REG12, + snd_soc_component_write(component, DAVINCI_VC_REG12, DAVINCI_VC_REG12_POWER_ALL_ON); break; case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: - snd_soc_write(codec, DAVINCI_VC_REG12, + snd_soc_component_write(component, DAVINCI_VC_REG12, DAVINCI_VC_REG12_POWER_ALL_OFF); break; case SND_SOC_BIAS_OFF: /* force all power off */ - snd_soc_write(codec, DAVINCI_VC_REG12, + snd_soc_component_write(component, DAVINCI_VC_REG12, DAVINCI_VC_REG12_POWER_ALL_OFF); break; } @@ -130,24 +130,25 @@ static int cq93vc_probe(struct snd_soc_component *component) return 0; } -static const struct snd_soc_codec_driver soc_codec_dev_cq93vc = { - .set_bias_level = cq93vc_set_bias_level, - .component_driver = { - .probe = cq93vc_probe, - .controls = cq93vc_snd_controls, - .num_controls = ARRAY_SIZE(cq93vc_snd_controls), - }, +static const struct snd_soc_component_driver soc_component_dev_cq93vc = { + .set_bias_level = cq93vc_set_bias_level, + .probe = cq93vc_probe, + .controls = cq93vc_snd_controls, + .num_controls = ARRAY_SIZE(cq93vc_snd_controls), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int cq93vc_platform_probe(struct platform_device *pdev) { - return snd_soc_register_codec(&pdev->dev, - &soc_codec_dev_cq93vc, &cq93vc_dai, 1); + return devm_snd_soc_register_component(&pdev->dev, + &soc_component_dev_cq93vc, &cq93vc_dai, 1); } static int cq93vc_platform_remove(struct platform_device *pdev) { - snd_soc_unregister_codec(&pdev->dev); return 0; }