From patchwork Fri Sep 1 06:07:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9933505 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 8D35960309 for ; Fri, 1 Sep 2017 06:08:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75BF428533 for ; Fri, 1 Sep 2017 06:08:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A76B28536; Fri, 1 Sep 2017 06:08:53 +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 A783128542 for ; Fri, 1 Sep 2017 06:08:52 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id AD4FE2675DD; Fri, 1 Sep 2017 08:08:37 +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 1C7902674FD; Fri, 1 Sep 2017 08:08:35 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 37A542675BF for ; Fri, 1 Sep 2017 08:07:54 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 01 Sep 2017 15:07:52 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id BDE8A71D8E; Fri, 1 Sep 2017 15:07:52 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.41,456,1498489200"; d="scan'208";a="255514218" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 01 Sep 2017 15:07:52 +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=6A6DOV48F9MiuOfuXCQeiia4Y/1OOtGsaghV0Rcf1l0=; b=W7OxlyJcZo0YQaFgI7ey9UTgCz/PI52QDBHBAniB9Id0s9dD4mA4Wmxgefmz4Y3fedqvzBNSQD0hZBDHgGQOnA9ZXM1ThAd9l8qMJFSiyEtHGXoljucpdTlYJPy2IQ1RhW+41bSLLc8fucF2yrFRg2Sjcqe1bB3h6vnyo/eK8lA= 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 HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 06:07:50 +0000 Message-ID: <87wp5jklf3.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: <8760d3m03x.wl%kuninori.morimoto.gx@renesas.com> References: <873787ngjb.wl%kuninori.morimoto.gx@renesas.com> <8760d3m03x.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 1 Sep 2017 06:07:50 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: HK2PR02CA0157.apcprd02.prod.outlook.com (2603:1096:201:1f::17) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76500b40-e545-4ed6-2846-08d4f0ffc6e3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:mjp8zsc9qg02RvJSCavHIz+57iSdwc78MXCEEtmvEeyxo8Pt2hCi8vfN5DPLis91AzKWi+4iNqG2DSNCklHbkzLeNC12lw2a6AwSm7Jy5Z5Un5MH8cCsdItvG60dN+lFZhx9dJoXVs7BaEWb2E+RwWOyyZhE078kEMEOIIMMwH6q5YaL8hsXR3BkBZRa88IHHfKtDxF5ir37KY7UV1fNaZ+ipmyJ/o+IseAHLN4FvfnnQbm5pmmLIwS6gV9ok+6L; 25:evFTQjY3VG4o6Ra7If41tz/IhiS+55rrk1eV8Bu91IulauYMMcE53LODThbDRX+K+eStvp40xRsVPoSJ15QXGlVsta/XdvP/RpsHUDgw0zmcBLCt1xm72rGDTcSMr456QYxOuRwebm2FHFzCFXpbMHzgmtiqDWtEb+oGswydFu+1Kb4OnKLMXFo7PZELtttynuZ1EfChdxR9aD0M4GHK5IEEXnZ9jOOxqFcsiuFVQsFZcBRpgWL54aidr+XufygakbG2/VNwDgjRozrFe4M14/fvgG45rxD9pE2hCgT4PJeCuWONrhyi0KEu5Z6t7RU+ddFrxs4D/BJ4NHiR4q0EZg==; 31:Qo/FFseNST9U2WgqxIZ2/+AzF0JF51/KywDwa2WrjBsbVn0lbOWq1wOI+UQJDlNYRF1kwYsDF7SYCgcepPKJqOk0qgaFZQUdnVS7PMEBZGEUzPYvRC/cIVoU7ornlmMQ3XUr9yz8RhGtr9H9m/BIIvsxiNAgESckbJ7yhrbIQgzGGDBamhLCHV3F2G8claJLBYsmpWlJJWITG+KiuqRiCwaPlMPNVXYJJ+sLNa/lIYI= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:19OaoalZf7pQkGOr6irU65szl6rm0ymOfj0lTKPq3SweKezvr29zSBzSnqSpXQ5VAJ5ODVNSua6PPvUwz5a9HOcYXCSQnQGnJPkhzoBCh1FrN+1bLERbcaC7gHZ99X4Tpy5KIgsLPuBRV3hAxYPOHkFbCRkWvS2ZJUD+nhqddH20KOfTUqUPxs/WAunyyUEypg3pK8oOKwwu16Ume4Cq4gL7lQVABVEuDrGThDU0ZYWHOsXgHYNFRGohlutR5gud+EXUjXMtmtVM7q68vJFpAkI58Imjm4MrFslNWIc20kMpSiSJ+W+ZR3SUUSwohAsZJ/pbNIPkfsSFIK5t2WHWfWYfJ/sZ6Zn5ePX97A5BBZU3WULArjVd3rV5YuhByEAmklBCoPvk9u/Uw4VrSgqcb+yHEUFFTdJarWl2vvQLua6mcynshiJdt8duwFz2MgRQNcIyYjP4gk8cqFSlmsONPPgNSJDkC43ry2DojBiDCRWs0Ax1HCk1lJfOdANTkevr; 4:C1BUhFs7Vu3iDD9QSgtYYmMR+4Jj3I0iY9jkhZmp7HSpGULYqGq66c/uGE/Tl+O+Zz27kz7xmp7eSeiP8Q32pKNLcpvUTvlgxy0Lw9fbwyL2W/gtWqWfIvKS8tBde2nXxLjTXijcpK3oK9uQ1MndaJemFnqzniu6INwtzGTnWqXL9nrCb0ktQ0wRFkTjldh/nc2yvf5j1l3t3W61EJXST3fKkewn1JMUnDA9cy50ezf1KBm0vXk8bYsicAD8tes4 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HK2PR0601MB1874; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HK2PR0601MB1874; X-Forefront-PRVS: 0417A3FFD2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(7370300001)(4630300001)(6009001)(39860400002)(199003)(189002)(2950100002)(478600001)(69596002)(97736004)(83506001)(81166006)(86362001)(6486002)(25786009)(54356999)(189998001)(68736007)(101416001)(76176999)(50986999)(4326008)(36756003)(105586002)(7736002)(2906002)(6916009)(47776003)(106356001)(50466002)(66066001)(4001350100001)(110136004)(53936002)(23726003)(6116002)(81156014)(33646002)(5660300001)(54906002)(53416004)(7350300001)(3846002)(8676002)(42186005)(305945005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1874; 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; HK2PR0601MB1874; 23:ch0H9CrwGo+Lv7EipVNHWdJDvI/Tg3I5aVa97Oi?= =?us-ascii?Q?POv7uI5eL2LP/AnnIJ55l7e+wwzZHy+MQaQLZ02yxwzF9YmR5JmyR8Bt13kx?= =?us-ascii?Q?YZDOxgkIT2Cg685ZyW7Xj1CPmfIsSUJ0IEoRqYvoREe2u89rEro0vLEUBPrb?= =?us-ascii?Q?c8lZYO+ANx1wII0uAn6Yi9gL8mhApIY75CpVFh+vYKdP+xptccEcPjXEXbuv?= =?us-ascii?Q?ifVWY4bhc9mber+9oGoNw5Rn2fPkhxb/K9H4oeDPX9D7vJEZDn3V444Oh5+Q?= =?us-ascii?Q?c3brcJ9AihyaY2rLVCbGokyqaY2J9ArEskvnXD1+u/cuH4eRduD9EVypWstT?= =?us-ascii?Q?pFV6u3/9aQNQOobRS3tM7nBs3HlT56jiK769nkPPOPnTeujdhfi28JF/vqkz?= =?us-ascii?Q?sCbnEWk01Ts1VGmBVt0W5KR2r6mVZNYO5foiT/L85kkRTfrKKyBXJ9tUZbsB?= =?us-ascii?Q?5UihkCoEA+lqgyLlBjjZAJ9qFtEDPgVFnpXznI0QUH3pWj35jMLunVv1cxS4?= =?us-ascii?Q?5WOs2vhvZ/mLLT8eFDifSp/pq76UA6lldDrFW2kMANXEhNv63H2VpcTPTxVo?= =?us-ascii?Q?fKTN5oJe1q5ms6+Xx87wraabJlG6vwwXP2/OvlpeRJ520MS/IDY4LzDHr1Xx?= =?us-ascii?Q?0h/4KnOxWUZPOXP1IV93tB/O0eVpyUIi0lflp4cs9LZcBVF46t6nCQA3Y9yY?= =?us-ascii?Q?RjvYPOiiAxUNKJBmjX3fdW8qM6VnkZqCZd6OPURfgcEFmbxl5ayxNgMj9SpD?= =?us-ascii?Q?wD1yJDwt4FkDi3vPAC1k7q+MGDH/fsE4MyCjB0f18EDoZbgKssmlHyFNWXGx?= =?us-ascii?Q?ZrxY4ROWAvyIb2wbrPbfVTOehsR6luPz34OKszE5gqHd3Kf/X03Zh2gmRObP?= =?us-ascii?Q?9Ameb1STwGasKeQ0geDmxruKCS6BsvgJLWoCmXzLAnuSoJTEYIMbTzy9lpg+?= =?us-ascii?Q?763k7fs0bE+TzGgs2e9fSyPS5q9LZ3Ci9dPYn5EO2eBbK5bGf+FJxMVWdxRC?= =?us-ascii?Q?QsmRL5Hs2V6MnGaiGI0TE5W9tzyepShW8vXxZHQsEtHVBPeKPTIAYle6UQ2f?= =?us-ascii?Q?9bNNVjipbU+PoJ8qrHe46UkaP/SiQwr/NOY4SdUcF1YVNPoRqlAIw7QS5nJ4?= =?us-ascii?Q?5SUAPklJprPSrDhLk4rXMcgtt/sEj10oLjGhBJkNKcn8M7Wozp7CSNA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:G1tV6xXKC9DIFkycoc/kjJkA9L/hhRLHlCkcu+Jo4ARXaVT0ZfKAHk3BZw62w6nzUs0PBtTaFbxs64drypLWupSk0e89boNuBmEFS59ajScgllF4yB1zXP1wx+VX9yWcRaoYl4Ayl/+yBzv0WrWuGmyPPQgUhJ1puF51adajmqagOQrdClJjubkcI5LQG32v+yC+t1KcAedvLK992eOpTnOuf9GOucwm9K6pQHHDDTplBh++BFPyaRxTanR+tIJiO4WhcTEfvtpGE25isyH5PURK6DcGQ/uP2q6dTAXbpx6wpil+aifKyevl0O1zpDHAy4PMYtCphQFADAng9yAa7w==; 5:ye8X1knxZ5VErSlFLKlryNYyJkaLRrs7DnXno0cxMUXYk3JPzKdPRZC2ygaAfjHEj8RUd+ZMnlODx18+hCNS+0H6Kvg6/xH7AEc5zHeqeV8uXiiql/0yK1gEuHnv/0yV3t3K6PseGjhHDi7f3SaaYw==; 24:iQj45OFerbbSXziEOHsvZHBt3VXWMuQXZ+aXJldBJcOeaLYAFex0WEaKnuBk2VLLZ7Bc6vuHLF1gcKPE7dHZTi+tNCytVseKRKDUmHpvwIk=; 7:NHeKKmSLBJX8xPuP2ospWzIn2PDHD0RfCgh+W16zi0g5hVcYr539Ugnx2sr56xFKf0ZjG2puPbVNaBifEvMekHZbWCxtMWsnUAU3kBOMTExbJYc9KeetGxmWiMHpbRIPCrg5pPOoz8rGu3sMDY/5PlLk7WWzOZbv2A13YOl6WS0h0A2hJHV/crGKUUsnpVRJK7WPe6nIFVBx3lX09yfWeRRIpROqsCvTHH64JLhJyu8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:ricGsEBXlhcqqGuwnVE82sIjpwAGY2KCLTyeaCIRULmypAcsbjNxYT4lFHxE+UTuoZaBqglkPRBrxXzgfBdX0FdA36Gi+LlJO9q16uf/rVSiV+YuFRdYW3FYTZ6mUVrqsLyaOIt10TRJLE+6cA2iHp/7Whtb7YOT3ERS30z9pOA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 06:07:50.6435 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1874 Cc: Linux-ALSA , Lars-Peter Subject: [alsa-devel] [PATCH 06/19] ASoC: use snd_soc_component_init_regmap() on wm8998 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 To setup regmap, ALSA SoC has snd_soc_component_init_regmap() and .get_regmap. But these are duplicated feature. Let's use snd_soc_component_init_regmap() and remove .get_regmap Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8998.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index 44f4471..59ea3ed 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -1321,9 +1321,11 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec) struct wm8998_priv *priv = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); + struct arizona *arizona = priv->core.arizona; int ret; - priv->core.arizona->dapm = dapm; + arizona->dapm = dapm; + snd_soc_codec_init_regmap(codec, arizona->regmap); ret = arizona_init_spk(codec); if (ret < 0) @@ -1360,17 +1362,9 @@ static int wm8998_codec_remove(struct snd_soc_codec *codec) ARIZONA_DAC_DIGITAL_VOLUME_5R, }; -static struct regmap *wm8998_get_regmap(struct device *dev) -{ - struct wm8998_priv *priv = dev_get_drvdata(dev); - - return priv->core.arizona->regmap; -} - static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = { .probe = wm8998_codec_probe, .remove = wm8998_codec_remove, - .get_regmap = wm8998_get_regmap, .idle_bias_off = true,