From patchwork Fri Jan 12 01:13: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: 10159155 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 E70186029B for ; Fri, 12 Jan 2018 01:16:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4CEF2870F for ; Fri, 12 Jan 2018 01:16:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7DF92875E; Fri, 12 Jan 2018 01:16:20 +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 9BA852870F for ; Fri, 12 Jan 2018 01:16:19 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 68B8F267AA6; Fri, 12 Jan 2018 02:16:18 +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 3CC2B267AA7; Fri, 12 Jan 2018 02:16:16 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 98D2D267AA6 for ; Fri, 12 Jan 2018 02:13:53 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 12 Jan 2018 10:13: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 1C7AC6963D; Fri, 12 Jan 2018 10:13:52 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="268006369" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Jan 2018 10:13: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=zhsAtOmq8H5Be9NlWazfuTCzgUBOrZDfG1kBRU8vxeo=; b=MRF0IEFCnccMiwRjx8MaVV3DbmmFy7DgRFCw2waMXl2IzI4mWHqvrJxl+30t6nHQT4vCd+8GbR/kj7mZ9oMjvguMEZrICUbhRXBcTFRp0Te/jNc6D6RjSIqurQHntvt/brEVZFpjXehyLwNZGuq7Th4F4XewS/baB5+9pHaEGwA= 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 KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 01:13:49 +0000 Message-ID: <87h8rrdgmv.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: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> References: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 01:13:49 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0161.jpnprd01.prod.outlook.com (2603:1096:402::13) To KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 41ffcb4e-5d0c-4c60-564e-08d55959bcb9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1879; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 3:1M5Laag5R9e/r19qielXfdd7p667Q0ZR5voJ7U0rs6Gal4aZyXbEcx3Dc0qi6OX48l1uO8xtQMy8WEWuNueAXJnnqatynXgB5yajz2wSRnm5gxaBiFGRwy5k5vu77BLri+i948gP/i/nFErC6ao8WUL1HyX9ksd+NbALn5IOWkPVxL9FrfHxjSvdpdBXze+Y/F7Xm5UR3kFX400sdfc07L4ILzIvTuGoCUbqkhtKqjuYv5943n/GXFXVkzh3DH5i; 25:m2SN6aqV2L6c+ILl1Lp8RMmTU5gc++6cGYonUoqY6hUCYJNz1GaKJ/tePHFUxzsCTfArssjd9H+2lcp2dSIm+/Y2XkzLy/xaWMcAWj641bomFcrMN5CHV+jWO0ZKtrop487WTp/i8kalQAyr8A4W1YdCwaIAA3I1TOwPkeVU28BXguKBAS1rhXXFlm/UgW+JK1D3YgItuhTsmU8TY4NhL82/CyrC4WsYJhl9TY18aYfKeeTVb6hcfkJQWubOh8RrNXaiEZE9Ofnm5JUCd4bGRUmlLCKhiF/UMpDZCibgS5jdRZ9YxNugHxU2Am55V2qA3c9Azwz+6Z04KFY9dn2jGg==; 31:7yVEypigPYs0Jregw6+yBNjowUi1/89m5IFA+idcyw2LG74F70uzmHPb69vPXNac1vvuZtaJ+vRHaHWXxepP3yf1Dev/mUyspxOIyKkS6mp0cnR/ZHO052tnZkhvBk36I3qowPRg5g9NBE9lHuK5nHSYQDPqZWBwLydZ/u3pH86spnwWX7sVVOEL8H7+Yy7M/B6bLp9HvWgATKa2MmBygbArxH9eaAz7ESUG/1FWYj0= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1879: X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 20:h+w1kJvfvPz1mLm3Uc0O425BRN9Qg72hknGzz/X+dtBhBPiTPQaSVM8GbOMD33ejcQWxq1O2ESisK6cvTkOvoXYt2XEZp1fC5i2js/oMpR01WAXTdglhqreFRREDubY66SMQXyaFi9Hz0jUts22cyUqkI0ai6S/lZBeV/U6kyydEbqYHVSeamcQ7nTWtK9xTtszu38A5+cHtyRhCRm7GvWqb3rdB69iaoAYfovWil+83Ib1TDhxlo9uz2i4VpBZXfozc4WiVJj9hQtfhqXtVu1b47JrkETwuX5Bg2W+RBK/4m3Tei0A1dfqZjdY8izLTV3r3XlzCBnROwwwQpFDkUXSoEHBCnJSRjNH3vU+aOteIZPDgafE/ByDSoz2RYXshR0UAe5q0DNun+O4eBkCRmaOP3xyg6lXiv16tzbWQMQHjpK7Ebz/N+P1CwxrPdbkwDP6IZChqjuO8iq8sXP8cFB7Z3SERLoIOcxZ3U0FbtqG4hRhXXCsb5lvPEz6AzQJE; 4:chIigHsQgDnapvTXK6zSc9W+IfRyF0iOeUb3+atnx5XMw19QFTjYjkmqoMUfbL3Z13fYDt4dP8+iX2apwCm77FlP4guanZrXzemnK31eafcyw0MU9FB1N8m9JOAJeeguQSU81tj1NlkcbD+1tDkhWAW1G5cP6uO3GssVdU/f1k3jQJuF3xpIekuX0S3Sn6rI8rxBSp/whVUjREyW4z5xbA0AmJoCjD85b1cxexdv72xqPgk4sPxzlca0pyCV8FBMCT21v1e1THHrpG8Bju7rEjC9c6yp6WLa6xz+G/Hoo6IWjJ43Tqh3/BtZFUT2OGSs X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(10201501046)(3231023)(944501137)(93006095)(93001095)(3002001)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:KL1PR0601MB1879; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:KL1PR0601MB1879; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(39380400002)(346002)(39860400002)(366004)(376002)(199004)(189003)(7696005)(8936002)(76176011)(4326008)(8676002)(36756003)(53936002)(81156014)(69596002)(54906003)(16586007)(2906002)(16526018)(86362001)(81166006)(316002)(58126008)(68736007)(7736002)(50466002)(97736004)(52116002)(106356001)(6486002)(305945005)(23726003)(83506002)(59450400001)(6116002)(386003)(6916009)(105586002)(25786009)(47776003)(478600001)(53416004)(2950100002)(5660300001)(66066001)(3846002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1879; 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; KL1PR0601MB1879; 23:no8KZfSi6iQMhBcvZCn+9bNuyuuXukYcccEOahS?= =?us-ascii?Q?WwCjVwyplSyDTxIiH28mgp7A530VHpm+ZHmkObwq+I1g/pCgBNnWsKMIhDLz?= =?us-ascii?Q?9hkxrTURxuJzwo7YTE5pBMJVyTssO8v4iU6qHIVgDQcSTHCm4ASUo1ouWWYy?= =?us-ascii?Q?E0QtlybVahJIoUUtuzBD6h3teDV7dUjHQGoz6KZLdjRDGmI6tQkPF90wesQc?= =?us-ascii?Q?CVBx9FObgWN2qBmWy4WZO+OozVs5oBpHgKIR7cDozTrKIgcbJB9UnCCNbPSh?= =?us-ascii?Q?mC4CfgFWXqsu6lOKtpsN+G8B2EgGw32rgF8fJJ4KRcuy72q5VsCMwDvWqJa5?= =?us-ascii?Q?A1TPwAwj2h2fcIAJWBtmcMgN9m9wj2OsJFgRx/HR8jqTmhMXWodv29PeukJk?= =?us-ascii?Q?+8gU4YQDgDr1mvzBbq4+IbsfdWE400tJCAQ79ig3zk7kdcDhhN6t1hRglfdA?= =?us-ascii?Q?ZJufxwbuyI0ol693SUWn0+5zoOpB8+wbcueGuBoXPIjREuJN9fwdCebQQeXO?= =?us-ascii?Q?lOpMWQQXLiVSHwwn80hv5oNNrEUXZemgdDSbPYqCzeOpxkUhwYSqws+LZCgP?= =?us-ascii?Q?5qFX1JRR60O84L8HKOBXYXWOISIc3uip8hHAhGQ+UClc0XEoiqoXtycFXpOF?= =?us-ascii?Q?3tiJPZbkSIatXk6OsBBSBTJGBf2fiXDd1tqQHg7gLUrCeGWyKoS+QJr/FAjt?= =?us-ascii?Q?EKuVJ8E7iHMOWfmlM2L06CCL2zv4+sJcc7B09R9dQYdNi4D61Gq4aFK9ff+6?= =?us-ascii?Q?oDSFvTzvV7XWZhnk7t4gN+1sprpSAH4w42PfTasmxUgpQj2g31Lgat4sxOpS?= =?us-ascii?Q?6m/tPJ9Xa8Un18CcElsi3eNTSGVjr9GBXjWuLqPEyCipEfnu5CfR5QPMBiEJ?= =?us-ascii?Q?OxBjjQz/f7bwTYUpveBaJ2vcM89WVulIAWBjUoE9959pSGplAUeBTaQm+yhA?= =?us-ascii?Q?FMei0wHCkD47O7bvlpXIRyQzpHx3vZjpG96brAOPuxhXC9+qUm3W/3VLQ0SE?= =?us-ascii?Q?te8y2v6vDT20J8X0uyqKth/j2aVBqV16t38mkRAzJjkm9oSwi5YfiayLHdtM?= =?us-ascii?Q?LLdUHRNQGgtS/deiXvMMwTvRS40PPGLUdcHWi4Rfok12yZsA321CpQMK0/Av?= =?us-ascii?Q?H+WA/AS60AvAge+7pZSJJ99NaZtJ8qiZ+5mWdGX7Ji/CR9Jbf7rYJtA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 6:5asHPAj9N4WpRJ83fgdG8+p8hYxJkKkKW9vaKNCa3rkkx/zc15onTNpVQ4AwqWI/vGtCQXyGSC+D3OICzhZq8fZZFbyK0vf01UuD+Bgr2J8gQNxb+LeqH9tyLG+M/ah5/cOMfgz0GSsrR2433Wz6K8inoLfjp5hyzQH7h6ijVt8G1YMfLuM5I/x8fppkpDnkGoidVFltTFW1RG0anjGHq1dlL2P3eMHC5uqSbVWAqY+H0bXUogxHl6rnwz3le2RLyA22aqbcjWvYbnRIidxz0KHlA1uUwKZAnbXzj3YXxWxsJBpmUjdxtX+u3+uFzPjUNSTswR8H6xKBO5GevvFYeqOvadcoAGTbBE25OeOkWyo=; 5:ALKDmpJBf4Oao2w+aGQ2CqOW9EFDlZ/ep8gAkaUo3xhSMLC9azS5vZKQi88JW/RdFVY8BcyEkwVCJklXWpFDNqPCjPZsY26p7b5XPmSdYuAuCOjo8utUjWp7Hesg28FS3GwNR3rAY4vlfRrNfmz4KOtCEy6KQT+2LTgLAvzJvio=; 24:pKFexZ7o4lvqg211rTz8yqhqTz7I1mTl7Of2wZhqNFxzkASprYJjZfkjE5hgVLFkgwq+XUAPzTQmu1pywHfZNclWD4OOGXt3dweWeRu9OZE=; 7:fi4gVcmJ2V06TdWcax+N6z5is23U92wI08SdYkx6Kyq4yAXOv9oB3sPiYR6OQZ5SHzNdcMo7x8v3y/tpSiq65p6TvzJW2bAWkgD1AigNlapV4xmZ9O6wpAvkkUvzns9Xe6zQfjBozP3qwvzuDT3BW7QbOerAg2WHdxA0h6pnOTqDDkSezt/bLkOwqQVmbpeY72nvXTOKG6UqjX5Pha6RcWufHduAzNDmLyREkPTZlVbONRzb/p8Ps0cgGxruXex5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 20:5zDDHk/cnZ9fjR89xqVh1jHxMV1lt7E4M3Ap7GYjhGNp/28WnE9owb+WxoUXpv7BwHd1Wd14YNCZBVA8mRc9wlMMmwvoAmkuC8DEMh0/i/g5CQyEfXYe2nzJC6KcQUChvZZg69gY4ryDjBdOprRj/htQyx1VSN5V5ftQWr6wDtA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:13:49.0236 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 41ffcb4e-5d0c-4c60-564e-08d55959bcb9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1879 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 021/187] ASoC: wm8728: 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 -> .pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8728.c | 82 ++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c index 797cc6e..b6f4cf0 100644 --- a/sound/soc/codecs/wm8728.c +++ b/sound/soc/codecs/wm8728.c @@ -74,13 +74,13 @@ struct wm8728_priv { static int wm8728_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = snd_soc_read(codec, WM8728_DACCTL); + struct snd_soc_component *component = dai->component; + u16 mute_reg = snd_soc_component_read32(component, WM8728_DACCTL); if (mute) - snd_soc_write(codec, WM8728_DACCTL, mute_reg | 1); + snd_soc_component_write(component, WM8728_DACCTL, mute_reg | 1); else - snd_soc_write(codec, WM8728_DACCTL, mute_reg & ~1); + snd_soc_component_write(component, WM8728_DACCTL, mute_reg & ~1); return 0; } @@ -89,8 +89,8 @@ static int wm8728_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; - u16 dac = snd_soc_read(codec, WM8728_DACCTL); + struct snd_soc_component *component = dai->component; + u16 dac = snd_soc_component_read32(component, WM8728_DACCTL); dac &= ~0x18; @@ -107,7 +107,7 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - snd_soc_write(codec, WM8728_DACCTL, dac); + snd_soc_component_write(component, WM8728_DACCTL, dac); return 0; } @@ -115,8 +115,8 @@ static int wm8728_hw_params(struct snd_pcm_substream *substream, static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - u16 iface = snd_soc_read(codec, WM8728_IFCTL); + struct snd_soc_component *component = codec_dai->component; + u16 iface = snd_soc_component_read32(component, WM8728_IFCTL); /* Currently only I2S is supported by the driver, though the * hardware is more flexible. @@ -156,24 +156,24 @@ static int wm8728_set_dai_fmt(struct snd_soc_dai *codec_dai, return -EINVAL; } - snd_soc_write(codec, WM8728_IFCTL, iface); + snd_soc_component_write(component, WM8728_IFCTL, iface); return 0; } -static int wm8728_set_bias_level(struct snd_soc_codec *codec, +static int wm8728_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct wm8728_priv *wm8728 = snd_soc_codec_get_drvdata(codec); + struct wm8728_priv *wm8728 = snd_soc_component_get_drvdata(component); u16 reg; switch (level) { case SND_SOC_BIAS_ON: case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_STANDBY: - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) { /* Power everything up... */ - reg = snd_soc_read(codec, WM8728_DACCTL); - snd_soc_write(codec, WM8728_DACCTL, reg & ~0x4); + reg = snd_soc_component_read32(component, WM8728_DACCTL); + snd_soc_component_write(component, WM8728_DACCTL, reg & ~0x4); /* ..then sync in the register cache. */ regcache_sync(wm8728->regmap); @@ -181,8 +181,8 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_OFF: - reg = snd_soc_read(codec, WM8728_DACCTL); - snd_soc_write(codec, WM8728_DACCTL, reg | 0x4); + reg = snd_soc_component_read32(component, WM8728_DACCTL); + snd_soc_component_write(component, WM8728_DACCTL, reg | 0x4); break; } return 0; @@ -211,18 +211,19 @@ static int wm8728_set_bias_level(struct snd_soc_codec *codec, .ops = &wm8728_dai_ops, }; -static const struct snd_soc_codec_driver soc_codec_dev_wm8728 = { - .set_bias_level = wm8728_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = wm8728_snd_controls, - .num_controls = ARRAY_SIZE(wm8728_snd_controls), - .dapm_widgets = wm8728_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets), - .dapm_routes = wm8728_intercon, - .num_dapm_routes = ARRAY_SIZE(wm8728_intercon), - }, +static const struct snd_soc_component_driver soc_component_dev_wm8728 = { + .set_bias_level = wm8728_set_bias_level, + .controls = wm8728_snd_controls, + .num_controls = ARRAY_SIZE(wm8728_snd_controls), + .dapm_widgets = wm8728_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets), + .dapm_routes = wm8728_intercon, + .num_dapm_routes = ARRAY_SIZE(wm8728_intercon), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct of_device_id wm8728_of_match[] = { @@ -258,26 +259,18 @@ static int wm8728_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, wm8728); - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_wm8728, &wm8728_dai, 1); + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_wm8728, &wm8728_dai, 1); return ret; } -static int wm8728_spi_remove(struct spi_device *spi) -{ - snd_soc_unregister_codec(&spi->dev); - - return 0; -} - static struct spi_driver wm8728_spi_driver = { .driver = { .name = "wm8728", .of_match_table = wm8728_of_match, }, .probe = wm8728_spi_probe, - .remove = wm8728_spi_remove, }; #endif /* CONFIG_SPI_MASTER */ @@ -299,18 +292,12 @@ static int wm8728_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, wm8728); - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_wm8728, &wm8728_dai, 1); + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_wm8728, &wm8728_dai, 1); return ret; } -static int wm8728_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id wm8728_i2c_id[] = { { "wm8728", 0 }, { } @@ -323,7 +310,6 @@ static int wm8728_i2c_remove(struct i2c_client *client) .of_match_table = wm8728_of_match, }, .probe = wm8728_i2c_probe, - .remove = wm8728_i2c_remove, .id_table = wm8728_i2c_id, }; #endif