From patchwork Mon Jan 29 04:16:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189109 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 EAF5B60375 for ; Mon, 29 Jan 2018 04:43:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8F171FE82 for ; Mon, 29 Jan 2018 04:43:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD835285D3; Mon, 29 Jan 2018 04:43:12 +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 E6C671FE82 for ; Mon, 29 Jan 2018 04:43:10 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7A6F9267C30; Mon, 29 Jan 2018 05:26:45 +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 0BE13267BF6; Mon, 29 Jan 2018 05:26:38 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 3E8B82678D2 for ; Mon, 29 Jan 2018 05:17:00 +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:16:59 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id E872F647B1; Mon, 29 Jan 2018 13:16:59 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270915188" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:16:59 +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=OzuDlBL9kTbvQ8h+IsAIL1k/DOdzyUARynoXMs717Do=; b=oflvKgHQbQzs3D++LtLZ0JBiuw8xPmrrdp6uhltrGADvJgL3usIBArATFIeKRbMXb7NPrESfOZpsaqrvDODh2GGuNaX/I8XzjbeHfh25t1xna8pXiLJjyz0ggtN3TpIv7kQeY6ngOsO7H4+gcjU7zxU17mv6mRzinEWd1SwUpvA= 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 PS1PR0601MB1884.apcprd06.prod.outlook.com (2603:1096:803:8::22) 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:16:56 +0000 Message-ID: <87tvv5xpum.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:16:56 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAXPR01CA0046.jpnprd01.prod.outlook.com (2603:1096:402:1a::32) To PS1PR0601MB1884.apcprd06.prod.outlook.com (2603:1096:803:8::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0ee74559-c486-4120-a67e-08d566cf226c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:PS1PR0601MB1884; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 3:9UCKd5BrCJ6uM8KkolF5x0Fv9D9aGwoLPUskl20UK9VZ/aevwYxVoB5jsXu5fkamJAROloWNkg1/ruc4XZxgP7q4rn1CXMCzgaGc5yp9JpXXhcdTjP52CXJq8h8/Sq3BOCcsKqUg2JVHYzRE186XA8UWjwKkEESJW8InJUudRJZyz9xc/Vxe0MyeVZp/zdKin9HEp+Q9o5ZwBLh2uDuzEcMyCf2Sq+LJOyqepaeJZauXej7naKIx1cUvnyXxL6lo; 25:uq26CFFjc2aGV0D636+mvPhaBV55D6xOIuJtebdcho82o2VXX++rO+/w8FFCTHyYd2ffbZD8NbqKQrAYM6XjHb5Iho4M0yluHUJxf0gH5Lb8StvnYA0bvXQzLZifck80D4a8xrY7YYHdVhLE9VRqUTqj5+mt7T1j77VHnglXBwXf0S7b63s0a5wfzuxd+aWDkSEZsf6k2gDnq69QcwjoTfQsel//1TMFGv8d4se1WTDsNSj8jO7SdbDtoqR8TVzzhVLUx8pwqCQJA9HH9ZMIyc3Mqshr/QGqKLt3m/ZxAKdmFvlogCqhBnf/kKq6JvPii7TSMHPgM1CpEhpibMUQBg==; 31:Mj3s4azz0DLAWZjcm6Vp2TONF6rk26+lxMehCnw2U2Swh9tWqUjGtCgHwMXsdgo/N4D5MR538l1x8zdpUEZoVFn3wf2+KKbvREwDjt7n443Ugl31fKzwE0Gz7Kyg3I81x2OruxrrZKRtjWmQXRRfh3OAN0InxKxnbu0N16Z/FVhDgYGPE/KPAVQbscxrHeKwzpql4IRs3J15zhrZRY3J3NwpukcsEL4TWermeddG16Y= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1884: X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 20:FDiDM/UHHaGtMAD1QTW6uHAqZKkCtia2JEqKN4noa2rvDSijGsrafL78bn2RHRTGA7hcgCWWYLHrSwH80FP21WijeOB/dgFSByBd5ArSz24jtAIcGTlknthyB/UlOPWVm4z+s1HOsZJ5c87jgIJtp4OQmQfgboHSR+6HcJzPqaEesVahx0ZRJOojfl81lHoaYOE/jPrKQVW2rAZeD34LBMi2thLcdfh3xrv0BJjLVuXBB8UNetADNihQTKj2Hov3plmLz6pInbhkJK/3Q0vpPVgBQmBN7pR9kHJ92iCJSbmnjclH1rYfNFFV8EaaqtfzE4YSqSVv/giLvAfyEVDTZPbx8nCLvhlgo38C26eg+LOTr0P+mg+unhFhOKKi4KUTZCRTzUOKZLpBdXkBEddzMWBVyYNHQlQ81et2W/lLdLu5UpfgLxectEV6rIYwE66CcVLyspCeRonhdY2wh0Rwx2YSfeMoCTinoI/tyi5ZCv5UVAfo0YXCiD1zZH7bCTLh; 4:hkmoNXpb/6a2qFsYKzf5seED9bDgiQe7FxPNsMSeIS9ci2BTpHV7aDAI5EfQPIvMGnumvGiRTTKZxlJAwf6KNqMPpuv0VMmkYU4KrhhCGRThz8c9jexb9nViWOG21ugy7XX4hjvlnz474wEgBnZGgL12xE3KztaFDJtlMfywdk396cfsWRfXlP0q6X8Eci4VgyCJUWWF1ib1YDtjUXCaU5nBgUy/uAmgRjeav2xIcWyYFbgulP8bXoLqx+4xr0C0gWXFbaGxQsKPgLfgepLRwUVJ4f2yRS6ctZwVezsOGf669Aop0dz9e50ei+s1gfAO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:PS1PR0601MB1884; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1884; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(346002)(396003)(376002)(366004)(189003)(199004)(7696005)(68736007)(52116002)(53416004)(36756003)(2906002)(76176011)(16526019)(86362001)(186003)(5660300001)(6486002)(26005)(53936002)(97736004)(7736002)(16586007)(2950100002)(58126008)(8676002)(105586002)(81156014)(478600001)(305945005)(59450400001)(50466002)(25786009)(386003)(106356001)(81166006)(6916009)(4326008)(47776003)(8936002)(23726003)(6116002)(83506002)(3846002)(316002)(66066001)(69596002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1884; 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; PS1PR0601MB1884; 23:nZnndFFaXuE+JucmMTGM3oUe2JZnxniyeRk9Eba?= =?us-ascii?Q?KU5YAXJC4c1Ex3CpxZTR0z6sRD37hnMj9yX7O90DDpnyQXW88YxNC+TUQO1Y?= =?us-ascii?Q?2htJ7NxenMBxcI/0Sz40l/lk4OqqyD2eeaw9TD5Vt1Cfirf8ApdFPRe+nzcp?= =?us-ascii?Q?F9OvNH6zmxgf2a4JI4E2/r79zhs05v0VK/e5mq+vFPgbXyRUM85m0dw9bTnq?= =?us-ascii?Q?cfcSJSug093IkDlR9uuM2CSXSwqszaGFW2NcAWxap+zQUGGBcHRTqI6TegEo?= =?us-ascii?Q?AI6QgFeF4CKSrT4P9bc9rva8FA5kCOpmXnXXhy7Gk7oeSPzt72UQDx+3odWH?= =?us-ascii?Q?gaLADyZNdlSHkAlHq63wMD+RJMhrNkKeKsWTxUG/pAYn20ctmRHCqhMBhlCb?= =?us-ascii?Q?9hw6PdgB+Thxg2Y5D8S+Mkjsa7MIXZr5eW9sDJe1KFJ+CtABtsPPh8ZIJqRI?= =?us-ascii?Q?2z8AX90RUsy+fPWxlwfPsp2GyTcy3ar7Cv/Y21wAIJlPkTdOzmV2dXUNvjuM?= =?us-ascii?Q?4cVSvBCaoIE9YhqM12/peh9waokRWQj323d04qoQqlal5LUVh2v+GJ6Q6DNL?= =?us-ascii?Q?kxUhkw6/++4jlisVxu7CW9wd18YBwQkdGqVAO58lGMlO7v9zyBI8fkP8h/45?= =?us-ascii?Q?c+aYko1ciCapr5t7nqn7+0A5SaZ7Z7/Av0n5fj5EzVDp84+kRuvfQ6INJ3wU?= =?us-ascii?Q?sFFL/84eFkALgzGKV7hUigshgxSvUcbt2jtcFzOv3XIhaJau5mm6hiintgKE?= =?us-ascii?Q?CUMxyARGFDsRgDmT1ZYQ//GRhZgKmoB6Qjmld3EBMNNAg7yhPyzHlmSw+4N7?= =?us-ascii?Q?59ONF+lB3f+jzf9E5DubCC1R+cjicT74+i6hJktKWQLnWQwF+Zu7ut4FCBTl?= =?us-ascii?Q?YdUWmarNgw3oKLMD1c/lwdo/DTeKWED4A96H/a1hIRkdy+QC3NnnzrE41Yo+?= =?us-ascii?Q?DeRfLd5TIDcRzeq3Kahk+2Tzn557oRef4ZEcXneVIZ9OtmtAo6kO6/ElSRlx?= =?us-ascii?Q?wwVE6UWa/E5MBWh//dyLjOYVPHEpHunpmHTipVnL/foEzIl9aF7G/5jOtIuX?= =?us-ascii?Q?FODRnfB45qgXXETZemZNvn0bHf8YE0DJK5A8Z3oKTBsziyGIkHTtUYz0J3SI?= =?us-ascii?Q?EY8lDyxJ3aCLtWWniyHci8aOKreKg0TxKDtHzNBG2TCRt3UOBeMDLwya/7bK?= =?us-ascii?Q?ct7AYULdYXU9IJDc=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 6:Ivn3+0S+F3TywRfwwPSMp4zi94enY5KugQ46yHhdHp7K+7VhVuXUdR2IK8M+yAPH3GukSOT6VUfuUTmwK4ETI9mgj71GZJF7/01m0DlLJHvzJ6CHg/wiJghmlhANb/mls0nME2ExeQBNW283obnkOnxOWjqnoN8E2QKmdOilJ3IEc7OeGjQxdqG7ZgPfIAKUEBDNMt0nn09jrFiQOCOxEee1MgP5GfNm8dJdRIrMKHt1EgnXtjtaSTqdDMJihBkN2htD7VHepcCvMBEad5nOEYjn0IYoBUWXJyiWKyJD2WQOLHLat5bRcAZ3rHtfdofFUVQLWUrcMoJv982+GMCYiCRIECesL7yonP4sA43L5fU=; 5:j+ukJmlJpOrm9/hU8HOtbZdGYZbMxXEYP7g+CIgXJZ0GRwjCrct7TwcJtMLe234qaGM0AWoi+BQdpwEBQcIY1Zwn/rlUoHaN92uEGMdkEBvRIKmGz87UWr+CzCziXeH2ph4lgGJgXvE0HnRsQSqtVVuWSXlziarH+4pQN/+LnBU=; 24:qCQ41cKn1iBtMlhJidCT2QwGESmkUkdEwOz8OWrErXAsnT7PwHFHLoLrjfD5cSYm+roaAtSiHnyOM2zj4aWnnP6rLplXLB6E7BzUDP0pLTo=; 7:zoQEWahVQxiXZFYKbhDUhcnnM/hcRojfjqy+HaFmwa7XW+gY6ogp18a7cW39jUm/iJU/18kNBM41SHRplvbfyFPhuVbGtEQLUrfCfYlLYG0EmzsoE+BD+fRarTnIasNtjaQY9dxIloGNjocHs4JvLTxiY72P2jVr0LqGqapJ+5RwxhvP6quG65ClB6LckAmhl7b7a7aLyYja1dPpRUFlHRLbT64aaJWBreWqIUnvcb5eHWu3oMWcbMiRWkdBnuq5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 20:50TW7gAun+HlDiGEWqly6vgBv+kp+2En7rNenQHqvleh7T6/HZDh2t5FdO0ae89PLq3qBammq04dCLywiFh19ZybDwV6+YMwfo3lwJzHlodAey+pGA9Z7HW1AGaDk4GhIoImBWG5CRfJgxp0kh9m3wB7oITwfsqe7LISoJvB6YM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:16:56.2258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ee74559-c486-4120-a67e-08d566cf226c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1884 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 116/186] ASoC: pcm179x: 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 Reviewed-by: Michael Trimarchi --- sound/soc/codecs/pcm179x-i2c.c | 6 ------ sound/soc/codecs/pcm179x-spi.c | 6 ------ sound/soc/codecs/pcm179x.c | 45 +++++++++++++++++++----------------------- sound/soc/codecs/pcm179x.h | 1 - 4 files changed, 20 insertions(+), 38 deletions(-) diff --git a/sound/soc/codecs/pcm179x-i2c.c b/sound/soc/codecs/pcm179x-i2c.c index 4118106..0374796 100644 --- a/sound/soc/codecs/pcm179x-i2c.c +++ b/sound/soc/codecs/pcm179x-i2c.c @@ -39,11 +39,6 @@ static int pcm179x_i2c_probe(struct i2c_client *client, return pcm179x_common_init(&client->dev, regmap); } -static int pcm179x_i2c_remove(struct i2c_client *client) -{ - return pcm179x_common_exit(&client->dev); -} - static const struct of_device_id pcm179x_of_match[] = { { .compatible = "ti,pcm1792a", }, { } @@ -63,7 +58,6 @@ static int pcm179x_i2c_remove(struct i2c_client *client) }, .id_table = pcm179x_i2c_ids, .probe = pcm179x_i2c_probe, - .remove = pcm179x_i2c_remove, }; module_i2c_driver(pcm179x_i2c_driver); diff --git a/sound/soc/codecs/pcm179x-spi.c b/sound/soc/codecs/pcm179x-spi.c index da924d4..89ad715 100644 --- a/sound/soc/codecs/pcm179x-spi.c +++ b/sound/soc/codecs/pcm179x-spi.c @@ -38,11 +38,6 @@ static int pcm179x_spi_probe(struct spi_device *spi) return pcm179x_common_init(&spi->dev, regmap); } -static int pcm179x_spi_remove(struct spi_device *spi) -{ - return pcm179x_common_exit(&spi->dev); -} - static const struct of_device_id pcm179x_of_match[] = { { .compatible = "ti,pcm1792a", }, { } @@ -62,7 +57,6 @@ static int pcm179x_spi_remove(struct spi_device *spi) }, .id_table = pcm179x_spi_ids, .probe = pcm179x_spi_probe, - .remove = pcm179x_spi_remove, }; module_spi_driver(pcm179x_spi_driver); diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c index 82a3d9d..4b311c0 100644 --- a/sound/soc/codecs/pcm179x.c +++ b/sound/soc/codecs/pcm179x.c @@ -77,8 +77,8 @@ struct pcm179x_private { static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) { - struct snd_soc_codec *codec = codec_dai->codec; - struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct pcm179x_private *priv = snd_soc_component_get_drvdata(component); priv->format = format; @@ -87,8 +87,8 @@ static int pcm179x_set_dai_fmt(struct snd_soc_dai *codec_dai, static int pcm179x_digital_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; - struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct pcm179x_private *priv = snd_soc_component_get_drvdata(component); int ret; ret = regmap_update_bits(priv->regmap, PCM179X_SOFT_MUTE, @@ -103,8 +103,8 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct pcm179x_private *priv = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct pcm179x_private *priv = snd_soc_component_get_drvdata(component); int val = 0, ret; priv->rate = params_rate(params); @@ -137,7 +137,7 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, } break; default: - dev_err(codec->dev, "Invalid DAI format\n"); + dev_err(component->dev, "Invalid DAI format\n"); return -EINVAL; } @@ -205,15 +205,17 @@ static int pcm179x_hw_params(struct snd_pcm_substream *substream, }; EXPORT_SYMBOL_GPL(pcm179x_regmap_config); -static const struct snd_soc_codec_driver soc_codec_dev_pcm179x = { - .component_driver = { - .controls = pcm179x_controls, - .num_controls = ARRAY_SIZE(pcm179x_controls), - .dapm_widgets = pcm179x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(pcm179x_dapm_widgets), - .dapm_routes = pcm179x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_pcm179x = { + .controls = pcm179x_controls, + .num_controls = ARRAY_SIZE(pcm179x_controls), + .dapm_widgets = pcm179x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(pcm179x_dapm_widgets), + .dapm_routes = pcm179x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(pcm179x_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; int pcm179x_common_init(struct device *dev, struct regmap *regmap) @@ -228,18 +230,11 @@ int pcm179x_common_init(struct device *dev, struct regmap *regmap) pcm179x->regmap = regmap; dev_set_drvdata(dev, pcm179x); - return snd_soc_register_codec(dev, - &soc_codec_dev_pcm179x, &pcm179x_dai, 1); + return devm_snd_soc_register_component(dev, + &soc_component_dev_pcm179x, &pcm179x_dai, 1); } EXPORT_SYMBOL_GPL(pcm179x_common_init); -int pcm179x_common_exit(struct device *dev) -{ - snd_soc_unregister_codec(dev); - return 0; -} -EXPORT_SYMBOL_GPL(pcm179x_common_exit); - MODULE_DESCRIPTION("ASoC PCM179X driver"); MODULE_AUTHOR("Michael Trimarchi "); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/pcm179x.h b/sound/soc/codecs/pcm179x.h index 11e3312..cf8681c9 100644 --- a/sound/soc/codecs/pcm179x.h +++ b/sound/soc/codecs/pcm179x.h @@ -23,6 +23,5 @@ extern const struct regmap_config pcm179x_regmap_config; int pcm179x_common_init(struct device *dev, struct regmap *regmap); -int pcm179x_common_exit(struct device *dev); #endif