From patchwork Tue Aug 9 05:32:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270333 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 840266082E for ; Tue, 9 Aug 2016 06:23:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73E1A283EE for ; Tue, 9 Aug 2016 06:23:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 688112843E; Tue, 9 Aug 2016 06:23:50 +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 83564283EE for ; Tue, 9 Aug 2016 06:23:49 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 998D4268125; Tue, 9 Aug 2016 08:23:48 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5373726731B; Tue, 9 Aug 2016 07:52:44 +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 BEC5026731B; Tue, 9 Aug 2016 07:52:41 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 7A014267752 for ; Tue, 9 Aug 2016 07:33:04 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 09 Aug 2016 14:33:03 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 35EDE61D86; Tue, 9 Aug 2016 14:33:03 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 286E78002E; Tue, 9 Aug 2016 14:33:03 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 201038002D; Tue, 9 Aug 2016 14:33:03 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id QBW17229; Tue, 9 Aug 2016 14:33:03 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217521862" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:33:02 +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=FRZwtwQq8HEr0BBYZPu5S68+4cxXMQ79FBBxVvd2plo=; b=ieOhvsI8Jd4lEH5TC4f/1ZtXYbN/CWJAhYCCxCmor2aVuod/Ta1/dx4txecNsr/rm3MuQn5vSjuWFZ0vejvAZc7xAnO4Be44aTUzYldj5ty7ehTjPqJFi9GZF0zBKbapO8rjJ/7U7zYravq1lOtH6hD3/5sbvvLoFhOqrM7EPbY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Tue, 9 Aug 2016 05:32:58 +0000 Message-ID: <871t1ya4zy.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: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> References: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 9 Aug 2016 05:32:58 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0028.jpnprd01.prod.outlook.com (10.164.161.138) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: d6f50ca8-6f49-4d63-84a6-08d3c0169fad X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:FLfrcWJBBJ2WVrBm49pvuG4Q65afufsghtPGXLZgVeZgxXG0ViFQ2Cf0ciVIxPIdqPU7MA9W2yQJgK16iOmZdKNjxmSyl5BtfIBTD+/GsBUUpSnLnvQn8Zz/Fb38AXL4BI/2nt6Er139YCsq2RRLMe7+lNNAAaGz2Gwhq0sp2iMcnPGftivnMZADBlX5b9Dq; 3:3ADIpSAeanQgSKF7QdYgYzmxJQq2BIPtk57fPh6lS8QRPQXlZe4YtQPGK1i0CGTmSHNQU8ZL2eFj3riRkueaEDqEhY7SAXvsZUArpwysSqcl1Y8OPdM5U+TXehj3RMxH X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 25:VwCuQK3g020RE/IezTmJ0uxbKcCeTc+jZEJWweEqLXdV2EwnBM9Gjf47GSAyEYusW+LE3o6kFXeIokN/RmFU1KLKbY13t7ZWB1fxV3q8h3SbbQqKZFwEm3CmvTLmawX7p1UAAeR7mh7Oj2JrbLSk7NGJFw1Im1NxBaEjGUF4Bj3Kgk3n5Fx0lNiUlPWlAofu+AKipPZwvmdlOl65Qn4MP/g/a7z77cjIj9XQRf/6pWBbR7Hq9O1qZsA83m+SZt8v1hJMkmEmymTPCbI0rXV5y8T1PtQgpCitzmuxJTHCgCJrfrI0ZPb1QX1JoarewLHo10c7xog4+xUUaYdqUrfeEbhbiHc0RoIXFymP4HH0ZBMoWHP1CRfPPCe9FvDPSt/ogLmZom++Vmdo3tTsFcsmSJEm/XD0/IRSNnsSfsKmvP5Lz1+Tn2Up/16Zx6MNZW5mIWpzcTxjq3WyAPwuKMzHK3sH2IM5GLof1fGPdfVX7ZKANjD6K7WWeKosdvq+CXAjko29MxnVg32UD/KZV0O01THcf7RNKulzkzTFs0ETRY2x/5QEH++wso2OmgQkEeaCUnYrSI3KnWuxmL3B2JT2AryXlX60XFaSg5SyRItVen2pwOHfDBLzQmNCiw+2PuoIm6fa1w+8bqn5mS6DjiXIAhPvV5cT9F320kupQ2xjlnMGouKzG+q2cDBMUPjm2am/WK5rWxFjeKCGmRhyDGqHJg==; 31:6S+Y1zh/93EkWhrqssP2UXB7hUOGBee6l5H0vVEUe8SBPPpg89IJ3MFDP2L1Doh+9YcIYQADauPcv1KBUoYZ6Cp6QdEalSah0hKRMz9uZzKe5X7bg1rAnUAXMBTymKLaqzp28BPsYe5LGrtkghvgnXkoHUTdwZeKSTRKK4mGg5RghFwuoaOlYksxuKDeIGQaQ9f4MRi5uyX7UR+Edf8f9SjEuRjQ7xD84+bZaPpO46k= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:bm1+qJNbX/SWZCCgmuqAnQtHmCJcui6Bp+YeKxy9L/SZLgJSqg7lPfkJMSGPWXNdxVgq5ib6K3gSjTa0dgAqdbemheEW0mEKzjH9FRr14fIp1rBZo1JJtVZOVNjFi7bL3lyfwfujz8UrS5ONp2zrhWKuqflOIvqjhGj87ep16LbkMUFaPnoKqNRtsXaUS/y29djQnZdDcm/dZjohYfsn9JFuF65tpIhNlWh17VHAEjcjLBE/xJF8bNVQD17KOFIbyrczSG1K2CwWB/RUysloOiXHiOCZ6TwbWDx4O0l2D8ExCpMcgk3vGojx/nmChtOe1U5wWAczTc/TFigUGYph4YpAY1RoI3S7+PURjPDc8FgBoSaaheXVc+DoXkeFg9V1ZZ88r+hgIj3L/gmHTiPAIPWP5UdQCH+saJtge8xvnvEWvkyuXSB1yXJ2/Scl6L28Va6fnU9wOF9UTnmlfoF9HnPo9gIJ/f6kRZAshYbaSeHeXuLH7FpV1HyyYmQYOJa1; 4:H+GLwvvqITJIjfl9S5G99yE55gf0rcg2BTt1s8J4fAOzKC4/S0lyLEtWk4buCo0LtV9dG95Nve+qCcfStQ9NzVd7l7vgNyE9jqiFwyVFcrgcafeEhEXDZtg9yBVrIbA06FIPdl3BiF/QXF/flpqbauGLbvC2hSvcPqg16wsfUQBUUBNsaPsqv/mn5aBgu4yC8XyAlbk+KtMq8+CqUzNMEPjxGTIPt4kJ+Fw8svBbRH8a3DQAG7JKI2XnHkBgOPFr6+DTjj3cSRyxuWktFzwJTigHGY0FP4PMC8TWHX1hrQVUXRVE5YcT3ZBQ7/W7B10/ZgBgA4e3utQYhajBkC9qigAMGA9XvbrTdTZ/DfAx5mQMX6VjwJndQWk3RrYC6bSvX3Fex0ffWhiIwKGhiWh03w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:PS1PR0601MB1452; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1452; X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(46406003)(229853001)(19580405001)(66066001)(19580395003)(92566002)(77096005)(68736007)(33646002)(305945005)(189998001)(47776003)(110136002)(105586002)(83506001)(69596002)(97736004)(36756003)(4001350100001)(42186005)(7736002)(101416001)(2906002)(7846002)(50466002)(23726003)(76176999)(54356999)(86362001)(586003)(6116002)(3846002)(53416004)(50986999)(2950100001)(4326007)(81156014)(8676002)(81166006)(106356001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:yRTYwIfk6aGd5HPEDgV8fxBEfQjpTEO7WvEsjJU?= =?us-ascii?Q?AGc0LC6UjQLHSeBtfzANuytugSS+/vJnidMqfaxg6KVBhqOLUXYQF/HDLlej?= =?us-ascii?Q?32Z5d7aSkzkVkoHBqBxdRqabJWekRroR8T3Z8zbLcCHmM37zRFuBTqeJZm6n?= =?us-ascii?Q?qG9Hu5YxYWty0jmB9QxHoBX+75fWeqH/ZmHAEECFw/dvKK7s9BWQL3mM0qCP?= =?us-ascii?Q?c+V9JcuALWpI9wMQLw9zCfHxvW01c4gUNg2EUpzVUSY6K/35TvwPba3XwQXx?= =?us-ascii?Q?YZuDGnmmMwwE2WNvoQCTYPJHStPIcMqO9ey/m2g/sX49UUgNZP76LEXYLxP+?= =?us-ascii?Q?DFiPssvwdGif7H2XYUjsClF788U8fTgF8Wjat+AT1UoUFVXfuSw00WQTjvE4?= =?us-ascii?Q?/plk9+xBxF52XiY8Fb9qIcmKMdOsmznZILo/GCxlLzfzd08XD+whpkP253pr?= =?us-ascii?Q?ZGTu0pG5ELOmMWRDnAx/N8btzaxfFumUHOGpgRWkKm9hQ8EUuSsuzv7s5YS3?= =?us-ascii?Q?BU0/s/ri1fvlE1q9FX6gIBxnXhH4VmgxNCXbPHwMUG+baOUammXY8hAoOBCl?= =?us-ascii?Q?NVhNejOYZFPgy2KlPCfnEaCdfEN1eMKnyBj9aBofUU0Ee0cjFXSYPhxvfTKI?= =?us-ascii?Q?Ff8pJIVQ0TGinT+nhnAviLBHj/icnj96PSMeemYOGcsqfS2BU6j4rbYJuzL1?= =?us-ascii?Q?eKlRhYsmVbNa1V+sjlMG888sdQI69mzf4LgNqgpz1YMPpw2o0k1CGt5rI8fj?= =?us-ascii?Q?Xam7wR4qgZrTv+QM60Z4B1U+7ulj46m0blrPIT8iad9xUqCRJHeJVrCZRwZU?= =?us-ascii?Q?GhPHnHEJr6Xfa2mv14un2kqPNOPVlkeyq+ULnvaPhW89UPx2dBp6Iui1gEQ/?= =?us-ascii?Q?yuA+IuGibOR4XxOvfAlNC+gpjqcK9G3ZfIe4rQlvErNPACaYi5XXsgYt4Ahr?= =?us-ascii?Q?AtEKTmOqrHKqe9XZiXiCl7C1BID2qCEgKR+f5jjBOV7nwnkgYQ5YtqrJE1aw?= =?us-ascii?Q?woHrm1NjezVONzl10FcQT9kdGYsBKakTMQTs084xFrEuc89K9K7TfxewAKb8?= =?us-ascii?Q?P2xXUnF9V1FpC6LVChkObFZIRoR8JfEXWUxRjlGqNfgOy0YfXuCzWH6H7uxV?= =?us-ascii?Q?kXYx05d2q8/th3NWwFhTMLMTU2mFGw2F/kjCugbJWW0RJ5g676nytkw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:gApS1HvXPOimGTEOeSBA2u0TUHLjQpWj2ZXi92HaAcZaT3KpisHSmUgFoy7I/U6CK7NrPJ+DPvg6ppSKH0WvjYey47ru0DflZqHSwq6a1759rSlkAVrDHqoCj3IIMCm/weUOZCwLTz/0CtCZ4SlHKUzr4PPDRZuqqoKpCuVEtayFyxGAhmfOCQF/l9IWTt1Jnsnue5xKyZirpb70gCFnXCQd4UgAFlxQPp3lG8a11GaLOWofFCkQMiV3sTwNXIsQ3lTS81N1lnEj4ycsp19cOKyVz651ndVvoalB0ySqUTZ4Y0bF5pIS1NhkUJtRX5NZDG3bvKqSM8hXzUkHUslJDw==; 5:HLfPUvF/ZnWr+LQTSecwgSqW5iL4VmKzeH5Cq7+7TnKoa0JovzcN2gLgg3JCb5l9NAyfNIBJ9blozkZX9e3A/Sp79WDVJgFlAeN8qtX84SeDDuTxt7aWjqf4quMNaCcCtpQLgL/YoURUAYFKND+4/Q==; 24:95uH3u6Vp0Yu5LvPN7so3/wYQpbk35bbsTIVdBwUOreQo5cZsjy+/kpgZjpmAeCq4KyGF2ZJCxKSuts1ZQ4q5MBiJLPwMHbeACK46UKm2AU=; 7:3rnQYtsRqxwHTKpCSu4SQCOU4P/rSvgIPZrQN9KC1TtSS2Oz6Klx5KQ8AORDaoX2OO7KJS2lHs4iWKxt7RekLMaL3anq9mhoP1N5Zbv+aAZjurNu1W1gBFyDQAWrwITJVyESv0zujPYOU/BjAZp9stOS2e2fyTNUbEQW3jROhaUhPInR9KQey85E6CCUCN0fJBvkBEASSu2OcmgEWoeNlz3YLddySAifA65j+iIXXHFCt5bxLV7a3Keymz4NJ0tL SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:grCHwODneKI0O8z63CmqM3HMoZGaSqzdoscdDRh530EVaUjoRzb6tL81sYrFXsysp/FfrK6lN0EQ0IrBDLgJGRi6DVaZ3n2UwsA66Zkun84ZRuIz+RPRC6lBeOaSNffSurTsqEp46WNZrBekFYtFLpZT1uv0SFhlm6ANdQWmuOE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:32:58.6280 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1452 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 093/127] ASoC: use component probe/remove 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 codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/uda1380.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 533e3bb..2e2ebc9 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -687,8 +687,9 @@ static struct snd_soc_dai_driver uda1380_dai[] = { }, }; -static int uda1380_probe(struct snd_soc_codec *codec) +static int uda1380_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct uda1380_platform_data *pdata =codec->dev->platform_data; struct uda1380_priv *uda1380 = snd_soc_codec_get_drvdata(codec); int ret; @@ -742,19 +743,16 @@ err_out: } /* power down chip */ -static int uda1380_remove(struct snd_soc_codec *codec) +static void uda1380_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct uda1380_platform_data *pdata =codec->dev->platform_data; gpio_free(pdata->gpio_reset); gpio_free(pdata->gpio_power); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { - .probe = uda1380_probe, - .remove = uda1380_remove, .read = uda1380_read_reg_cache, .write = uda1380_write, .set_bias_level = uda1380_set_bias_level, @@ -766,6 +764,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { .reg_cache_step = 1, .component_driver = { + .probe = uda1380_probe, + .remove = uda1380_remove, .controls = uda1380_snd_controls, .num_controls = ARRAY_SIZE(uda1380_snd_controls), .dapm_widgets = uda1380_dapm_widgets,