From patchwork Thu Nov 9 00:19:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10049771 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 8228F601EB for ; Thu, 9 Nov 2017 00:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 738452A6CD for ; Thu, 9 Nov 2017 00:21:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68AE22A6C8; Thu, 9 Nov 2017 00:21:35 +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 AFAF229736 for ; Thu, 9 Nov 2017 00:21:34 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CC872267645; Thu, 9 Nov 2017 01:21:19 +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 019232675C9; Thu, 9 Nov 2017 01:21:18 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 792172675B4 for ; Thu, 9 Nov 2017 01:19:43 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 09 Nov 2017 09:19:39 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 5832E60844; Thu, 9 Nov 2017 09:19:36 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.44,365,1505746800"; d="scan'208";a="262909759" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 09 Nov 2017 09:19:35 +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=SMR1bYYAzQcRsoZMQ4C9nQ2FFNhcSFR49tnsg6ihbCs=; b=esVHZ8Bwe/iVAi+48yVrGKNokZq16zJP/oHXALazZI1Yi/jLRFgzA7UdxCI3U4ufu4aInTNxZ4MbcFSzvZCD5yKviqnpSfzvAPCHt3PLhK//Ib/mahIpnsmNZAa+b4ycfcXbd18RVZOPyJFZjMpzu9xQS2nb6PKqkHjZj+7Beu8= 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.197.13; Thu, 9 Nov 2017 00:19:33 +0000 Message-ID: <8760akqpkr.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: <877ev0qpmc.wl%kuninori.morimoto.gx@renesas.com> References: <877ev0qpmc.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 9 Nov 2017 00:19:33 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: SG2PR01CA0105.apcprd01.prod.exchangelabs.com (2603:1096:3:15::31) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92a1cb87-dcf7-4290-8af2-08d527078df8 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603199); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:M1AVx6wA9Ly8smoMS5yxN8quLXWrzyPg4CCqAVd1OkDn2Obk/p3dbIDWCe0YjUVEXqS1MdXCdk5UWERfAvhK+F9mzLZo6JTZ08PaQfN7CzUozuBwUtf9x7iTEZyUKkh9V6aeksbn63ejitTMaqEwA4/kbVb4pp3qFT2qRUFKAmg5h/yaSK3nPockShaqzOgQg99sOLTjgM2wGyjv8LXo9gBDO8H+Tr7AIFuqkyPqhlQarL7u5/x2yzvHEv4ro0a2; 25:qn12BX/jDFVb4ATcV+pH2M8GZc8YWTI9ZVsXwT0HeckLJvNDOfoZUu2gmJqzRjG2tesW+MXiavbNo3/uF5shgtQK/FiTZty59m6CVH4j4VDm4HRSit+JylHAag1XxtyFGkD6ZaZ4fqXhbULu8w5WHOjFYImn54no7m2VVgE5QHM+adTYtrW0I+ahhBashegmFe42WnIpXQ8hyXxU5iS6YR4kaDReVJOokawV+y30K3xrQ17hIqRthknWcKNr88InbdqSfqD3oBIChfgFVjfSadw2uvaEf2DlRivhpRTQcUGJnaUb3KY8fjWGqxHtinFIBLnlj1gC1yoo+ZYAkV9U6w==; 31:5uN77sUPEbnVPafYRDU60nwGsv5yPYWTL+lVeRcU6W3AJi6HV4mjw9phHkjdPOwezM1ZMNDvDU/pxe6PNi4OdK71k/qoINZcaGFVEvggahhYKscD5Yq0i0+v4YFQfG9G+Za39PNPbrphaMQmiDCYLkWDuTbS7DFmjvChkCpitFm0DHSV7pTcEwAhc583mr8OP9VD85hympm/SprLTn4txtZgb4BiVnJar5uS0ARVf34= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:9M1LXKTz4Y4WitO3lLf+1voEFFSNryeLkh7UVmpnE13+HmjNToniTG6PziaK69bik5U4pCd/JCwyLCv/X3ORW1VnzfMPWBPr7bCEADamdXP+V5pxIvo3lERLNPgWCLTGmD1ruYAkRWtSQjRyxcOivLT7lqdEDoWa/V11KvbxM+MCHNFAvRuM7PEBELmK50BBRAM6fqb07jkZJkIicB2BDIE/lQkRATwmTZ/OLYK6W+J3NjaGEDn3dTGdgAqbPfYu2gUjFMyGktax7xF2FV6op/aietHTE7mp//ENDa4aE9poWtINJcwZcEvUGdB0H8rySy/mJVoEhc/IHxbWYVu6Rzi3qEd35OS/dYCGqPlMF2nfbCjZwg1wySKnk2+y+r/5vE2gnbP89Txzfl6W6rXVGHmZZqB3+VlIOaO+EZemZXDDAO0443ztOXshWD8dMwVcOov+GzR860i8RUin01g4yIW9rHHBlhtbWNIQdYpsLLLwo/nI+fOxYwD06dUPWLvq; 4:2cMmsqkDAk35+WAWJcEj7VYN6kAazEIemA51ENuhu16ppfiJBmGNWZqovelGBtQoVHVhvuTQwFh0rtkAqKTYrQ+UEf/zkAac6TK0c8jpfyZKLzTg/0/tGcP2mfg6uQdZ9H96r75QEXfTOho8czDmYwHrv6jWZo/3KqpCaKkbvFP5tgCAkwtcx+5I0q5LYaN5nsek2FW3a3j/2XhLk0ivp6thZe+ACjT3oH9jSAh9c49PTnr61IMRBKwoY6Z5jcKbJNYRtlIgE2iayGk3TVH14w== 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)(2401047)(8121501046)(5005006)(3231021)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(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: 0486A0CB86 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(376002)(346002)(189002)(199003)(83506002)(189998001)(86362001)(81166006)(8936002)(68736007)(6486002)(81156014)(16526018)(305945005)(7736002)(478600001)(53936002)(23726003)(25786009)(5660300001)(4326008)(50466002)(8676002)(6116002)(3846002)(58126008)(16586007)(54906003)(66066001)(47776003)(6916009)(101416001)(54356999)(50986999)(76176999)(316002)(105586002)(36756003)(106356001)(33646002)(2950100002)(2906002)(53416004)(97736004)(69596002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1874; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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:C3cwbbj0AXg7fRXZgCXgZ/XHklxR211kutF+WH1?= =?us-ascii?Q?Bo5RF1w9dS98XRVkMeuQ6CDXs/I7eFkvbsJYk1t2ZhdGY1VKasx7aPaVoYMz?= =?us-ascii?Q?XNrsi1TQcyGOUPZrRXBvNA2dVstR3zFMZ0aYnh1qbrWnO4S9qfSaUkw93HIc?= =?us-ascii?Q?Lo3CtV5uZeqf4g4oh9lnUJnmNY/YUTHqX57Qu6j6OvP6T6IQL/9M4o6+OwU2?= =?us-ascii?Q?NeJE2XTQG01kMm/7+lXlatBzm0gHtE+RKjhIEFbd7dfLGq60xoSM/Mc0KwOO?= =?us-ascii?Q?m3cFgjit1x1Mb+D0lEEgPAMZqmsSMCKy/VTotBf0lSG6F9sBdjYUgBgUErU0?= =?us-ascii?Q?PcxquLVBw+LrNJkq7DpKKJTGGW9uZ5rd/+uO1OOKQJ5KbP0h7NvA/REuv+Zc?= =?us-ascii?Q?iZ6Hxx5IBplvL3WNK3K4uGuQtuATBYpM3kVjmYYrDqKeGRkW3rm6xHDxVQ2d?= =?us-ascii?Q?Z5ITeVvwJV6eVPH07gJOpM+/PD9qVgicCYayzTJKDbmFEhGAZR1B9XrZDZt6?= =?us-ascii?Q?rFzJWHEUDVzDJ9XENrEgkVC0y+PPZXlztMteKVw7DHl2uE2w5ZyUA/POLTXt?= =?us-ascii?Q?ygD7g21nXGduGW+RcrwdL36U5fGtJJOf2lq0gBwefBeNX384/wrMNIcB1SFd?= =?us-ascii?Q?dit3k+lk8u5US0UvX3f3f4gf657DU9lbKBc/duEDuTaK3j84eWfA9/LEfjEK?= =?us-ascii?Q?dvjebQJTe4dOUXtm+cPx4iXzG3NinMaE2SkzcoAlkKW60Ih5ODCBjgysESie?= =?us-ascii?Q?haX56MPcB4dBb8NxbVTeiKXxstDEt47gWdsgtSo625z+ZVn9aTeUt2yJ0tGM?= =?us-ascii?Q?g4jUv+Pi/6KfLZflM4PBFUTlKttJnj+00u6ZQ+eL3YXQmcXsF9Kkx5r5oiNt?= =?us-ascii?Q?XXV4MCxTiIs0qQz6Ne/ZsbasEaK7y2hHplBDBi0S0rSHgA4mF1vsU5N/COIC?= =?us-ascii?Q?egO6mfI/hPXDhZtrDMlOwDukQXjM88Y6uwnjvVj/l/X7qoRO2YtRRnF9ckMp?= =?us-ascii?Q?Z804Qqy5u9QJUGRFj878ACYjul4fAYoB5q9vzgwmJ/ZY4ymysVJf8cZbDqbZ?= =?us-ascii?Q?AaNN2X3dXCXrPG/BWcBwd/Md8ESJQGDLLzhW3fGUrpc64XEnQ5jfKvnWsS9g?= =?us-ascii?Q?Pr8bLb/X5ovUvVxoHez38YStvtuHwEUlL?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:Z+WosdIt+GRQZlK5kyMZHxnr+t2wKZ7TsT1tOh2pJQRBawYQgg0nC/ruVGTl+5l/QV+O5RGhDHocwtIXR8A43/K43FleC/Y7332DIyyo7JxPJSRmH5s1cM/tddVNXj1MYRgcukW77q3uaoBjd4VpngOMmNkII+77CgI5yE1nKXkKBwpvX+1vNlrka4TFE+8W7ThKAvu0Hk9N4OPtouOW9fMkKScJFOG5AAf9TrUF3p7NIUCvcHWdDa65HK/OSFlK8T4cST98/4j4w+3fiTIJBYZ6vh4N4cAjTKwXhpLjZ35e9Ots4TbxQ5ZEyhAdZUcUezgEVjSekDDe5K1j9kSHbDG/pPUsakrk69SaHplvibk=; 5:dDgT2eQClfDs6c+9Jrt9o8XvMNt3Wj9NIZBbvlkPZFfUd3QNQta7EgLs84i6EDfdBbOgzpLtQyKWxXAfYfwgtQ/ofQJ15Auv+r5HLVtRE85x1OY1d1DSqNEOIh0FtkcX+G1Ed5/J7DpHGbLwM99mf8jfbwTlbRTrf2fXTPkkmxw=; 24:oAHrhQ2zgHdFqjIWWfSH4DXYsLViEFiEQ1JrTLz1ndbIXGeVIIzrjK1iNCz8w0MDRi+JTgWM5WPBEJj1+XAWd2Io4qEDcsnqoLS5HOYGths=; 7:/rqYz1cROPIkteI8q8QeAgXRXW391ouipfIFEgEVu4UCn4J1CZELnM60/4PHocHB7LOzvrQ7QI4zm5AMaM2ELkHEubpXdNqqXTr6kiAp3s251dDpOc6TuPN6EsjhG63ol38u8JpbhEISjsft7LtEdXV2qFl9AvT7mGX6PGBlmb/eJOdDLypjUIJfCx+E2TS+ocsv+yJsKC5dVrr3hNwBr/cuJgs64AdMizQR5vGOUu2iJ4gwIzsnTFZKx2nEFdsr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:vu4T8p93uUzye8LyzA4S8AyjC8HKGKagT6UYyn4+2ZamKYGknjSsFCLChsDAUdWxcRXRqeFfRL6NFU6UFxYDMrGgJ+1+Vg1DpukDdRqmJmk4kyTuLt4xUdJKCozQ94ADZZ2OfZ+kfSxeH8ymW28lIZAwqksmJAtbnrNPtNNkaVE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2017 00:19:33.6360 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92a1cb87-dcf7-4290-8af2-08d527078df8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1874 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 1/6] ASoC: don't use codec hw_write on uda1380 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 uda1380 driver is using codec hw_write/control_data, but it is redundant code. This patch cleanup these Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/uda1380.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 926c81a..4444802 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -37,7 +37,7 @@ struct uda1380_priv { struct snd_soc_codec *codec; unsigned int dac_clk; struct work_struct work; - void *control_data; + struct i2c_client *i2c; }; /* @@ -92,6 +92,7 @@ static inline void uda1380_write_reg_cache(struct snd_soc_codec *codec, static int uda1380_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { + struct uda1380_priv *uda1380 = snd_soc_codec_get_drvdata(codec); u8 data[3]; /* data is @@ -111,10 +112,10 @@ static int uda1380_write(struct snd_soc_codec *codec, unsigned int reg, if (!snd_soc_codec_is_active(codec) && (reg >= UDA1380_MVOL)) return 0; pr_debug("uda1380: hw write %x val %x\n", reg, value); - if (codec->hw_write(codec->control_data, data, 3) == 3) { + if (i2c_master_send(uda1380->i2c, data, 3) == 3) { unsigned int val; - i2c_master_send(codec->control_data, data, 1); - i2c_master_recv(codec->control_data, data, 2); + i2c_master_send(uda1380->i2c, data, 1); + i2c_master_recv(uda1380->i2c, data, 2); val = (data[0]<<8) | data[1]; if (val != value) { pr_debug("uda1380: READ BACK VAL %x\n", @@ -130,6 +131,7 @@ static int uda1380_write(struct snd_soc_codec *codec, unsigned int reg, static void uda1380_sync_cache(struct snd_soc_codec *codec) { + struct uda1380_priv *uda1380 = snd_soc_codec_get_drvdata(codec); int reg; u8 data[3]; u16 *cache = codec->reg_cache; @@ -139,7 +141,7 @@ static void uda1380_sync_cache(struct snd_soc_codec *codec) data[0] = reg; data[1] = (cache[reg] & 0xff00) >> 8; data[2] = cache[reg] & 0x00ff; - if (codec->hw_write(codec->control_data, data, 3) != 3) + if (i2c_master_send(uda1380->i2c, data, 3) != 3) dev_err(codec->dev, "%s: write to reg 0x%x failed\n", __func__, reg); } @@ -148,6 +150,7 @@ static void uda1380_sync_cache(struct snd_soc_codec *codec) static int uda1380_reset(struct snd_soc_codec *codec) { struct uda1380_platform_data *pdata = codec->dev->platform_data; + struct uda1380_priv *uda1380 = snd_soc_codec_get_drvdata(codec); if (gpio_is_valid(pdata->gpio_reset)) { gpio_set_value(pdata->gpio_reset, 1); @@ -160,7 +163,7 @@ static int uda1380_reset(struct snd_soc_codec *codec) data[1] = 0; data[2] = 0; - if (codec->hw_write(codec->control_data, data, 3) != 3) { + if (i2c_master_send(uda1380->i2c, data, 3) != 3) { dev_err(codec->dev, "%s: failed\n", __func__); return -EIO; } @@ -695,9 +698,6 @@ static int uda1380_probe(struct snd_soc_codec *codec) uda1380->codec = codec; - codec->hw_write = (hw_write_t)i2c_master_send; - codec->control_data = uda1380->control_data; - if (!gpio_is_valid(pdata->gpio_power)) { ret = uda1380_reset(codec); if (ret) @@ -772,7 +772,7 @@ static int uda1380_i2c_probe(struct i2c_client *i2c, } i2c_set_clientdata(i2c, uda1380); - uda1380->control_data = i2c; + uda1380->i2c = i2c; ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_uda1380, uda1380_dai, ARRAY_SIZE(uda1380_dai));