From patchwork Mon Jan 29 03:03:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10188851 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 2916660375 for ; Mon, 29 Jan 2018 03:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1812B286A7 for ; Mon, 29 Jan 2018 03:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A441286CD; Mon, 29 Jan 2018 03:06:51 +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 B440F286A7 for ; Mon, 29 Jan 2018 03:06:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9087C267942; Mon, 29 Jan 2018 04:06:10 +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 798FA2677B5; Mon, 29 Jan 2018 04:06:09 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 6EBAD2677B5 for ; Mon, 29 Jan 2018 04:03:36 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 12:03:35 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 1100D67544; Mon, 29 Jan 2018 12:03:35 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269587446" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:03:34 +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=zGqAU5BaDLoEToXE0GtEeK0Q5/8/1Yw7VNi7O+wbT7Q=; b=Gj3J0gHUoZlcINiJH4uirhR6/v+YT6UnIwFRWftUgcRO9iP0kHFE15APJ+Gp6C6XY5NJAnU8h/bPKDef0+JcCCZy9LLX6gyb1DGP1k2JdTWjREmsrO77XbpQYCirhBFXPdu3+6HUw7RacicNzhblX0L4p6UGBfyYOJNR4a1B68Q= 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 HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) 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 03:03:32 +0000 Message-ID: <87o9ld4bbm.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 03:03:32 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR0201CA0033.apcprd02.prod.outlook.com (2a01:111:e400:5971::43) To HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 90601b48-416a-48f8-7644-08d566c4e193 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1876; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 3:Ozal//YuhvsSvVH2dZBr+JajFlj2Fm5KXxWhAu5U0ycA7EZTcgT9HPWPZ/jQDgccEOBFcLFkRL9Wkn3uCm/RJkA1XGGDqASq24SHPDed3GuEQ2KL257N2BNszIA0QCSQU0Wrv73fzQSKozYF8XIIIa3vSlU8DsoEDC27k+jjmPm0L30YTZeYpEyQKuc1rF4kRJjrF/8lvhD3/249cBFFlnhQ3nDDSscGtfXTSzzt+3PLwLpxaSxbIEf9MAgkO/2W; 25:Pr4bL0NzfXlDXwwGywCR6YnsTNAkZBZHiNNJllmemPHZWA1miQVGngQulL3op2zDdzAqRMRZvpJyLpzm8jHmeRR1MAmmOOwNVe12E8CihWWFFQV6fI1hyS/3PEdfxctKZoB+5+p9bUAr2NVzICi6sBlQpSq2k2F1/hI0Oi/IH0aYtFhRwRmJZB7TSA4nC/LlxzLybdG9TDfWv8tFNUZ3mhI6yQzqMhko0lVQfkI2+bwxcvrSrrA87C8aH7j6KdfvIUZNVZq8gyBWtrm1apcQgF7+AIJP/BS4jUWKisqfaEiB2W/fo2ha9+Bif89XxS0C88uBcVqrdQKCDIRpeA+D/w==; 31:uwT93O0tNClZG8zg6+Jt8TXPeS66K97A28iUUeTLCR/FggmqaIazXUZ07PYheu+YzPJEdlcQKSUpK3XdmhNFZFMme2SBZ2jATBRcq6mNn7SEJaBTgadxqCOG0UW7Zo/H/umpE3TrmudacwNrsXyyi40k4A8nxHhR79ucFaN42CFpUMPrYbWjmlW1jPKctQUEvCj+bwOukReRGYqEkTj+uW5nlkYxO1/tI0gXy6JHVcM= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1876: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:mR+hFvuP+FzI/I8lTPiJUsRYpN7BvCF9ZfGG8jKEw99DpO7xs3/6oOvi7WAfpbs2rZTn1mYGQ0YpJ+3NuHycvXZS7rydEz2WTr8txR2JbR0RAuw4ND0AjvGi7P7flaJ/I2MgP7H0zenZH07PcWAh5P2wHOkitM3uZ/rUD5HIhIHUzOhduLf9UcMzfzmQ5+Im8HCdXhSjFR/93hQ2CGMoBIAo4prX1cXzcD1t6JzlHv0n/tIwbnjiYB/RyJiBkKtpisfJr4LZMP1ZjGshXt+E+YIZh5Kd1Os5xUf80iJfKEE9Dl+Dj3Gi7ttjorgeXag5TiteDhOtKt06SYVkFJzCRsaxKK/3jS1/p8+NXjgREmZKwmFCEdPiy4cr/d3lQrLQ9AqBPdoHjra4oNmeiFjJE2f31/oIp6QZEpF6K6akRFyH1YZ9EOVIOfmfxwRwTxIZ6zs7L5OgJs5uOd5VQMUA88q/nXhqb+jHAFlEM+raF3X55RkZyBOfSCr2AoJga4Lc; 4:VV5Eq7McLo1FZfjHpHH4wQMybiD8wbFALy9PQmYa82BKy3iw2j4TVsYWPOxikccNk+BNtFiL2togvBuKrXLizYyngy9KJUxRVdqiBqiS+HB4cYFo3y2cHmGp75Hyy2Q1pHkIbr6itgoX/CwrQQFjfjg5hUiR5xDv8YXTVDu/CyQoeqqMeWAEEy64ta0OKzc3jPPMIsItT4buQi9S3R+N+d9+8+iIOL9XEvDRf+LH11TbN3L83tN38ieuh7/cTegMamnNoqGB0HRZzvFc+D0rJddw5+iBAtyhk8FGBYw52b0jKGzg6Xrxdp1aK2bfMXie 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)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(6041288)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HK2PR0601MB1876; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1876; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(39380400002)(346002)(396003)(366004)(189003)(199004)(5660300001)(66066001)(97736004)(47776003)(53416004)(23726003)(8936002)(105586002)(58126008)(16526019)(81156014)(81166006)(86362001)(8676002)(7736002)(7696005)(69596002)(2906002)(25786009)(316002)(305945005)(83506002)(76176011)(186003)(52116002)(16586007)(4326008)(6116002)(36756003)(3846002)(386003)(59450400001)(68736007)(6916009)(2950100002)(6486002)(26005)(50466002)(106356001)(478600001)(53936002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1876; 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; HK2PR0601MB1876; 23:9aKyDhXyCm7xy38u9ZQeI85MtnwscBfYtBglQrC?= =?us-ascii?Q?+TJ/S6cwEo1KnNunBULH5Q/0BS9tEEvcyCL85ZnVgX52JfMaBH9FXE9nt/en?= =?us-ascii?Q?s4qY0/W/3ueEIM7yHSB48Ccp2FLdaGkm5ozSKDmdpXpmRxv2poSVFLlaYbim?= =?us-ascii?Q?yG4DcnVG2PD6C3RG8b4OwtF49FRkqVVXv2rhM54DTQ08MtTEBSQT42XCJ/N8?= =?us-ascii?Q?kqLOcBCHYW/6RjmUlSMBUMZ1wKURXOBSSiIQLoromlx0ICkhUFQG0xajqtJY?= =?us-ascii?Q?ojIiD3MeSgnKJgRe9sst9kKi4nbHhJptQRd8+SPQJz65baK0bVfyBBzjFbRe?= =?us-ascii?Q?mCb7HgwkUIydTOJfWuaBIci/atz0PpYy3zI0jloMtAbTmkTp3Kf6Qp8tqRO9?= =?us-ascii?Q?Ac762waLRY1nKE8/m7e8/IQdDKsVhkyN22xIHM1PTcLtEb2kqPcM9KH110uT?= =?us-ascii?Q?4Jw7NXwNqszdvRVjCR/IKJUDX1UFT6s23eUugzhY8RXOhg8OobhWUr+XNKWu?= =?us-ascii?Q?t3bpbwM0g0PyyW0RrJeNqKPfNGUZxp8zHmA1LMWCJ/Z5jUEjG2IhVKrv+rNv?= =?us-ascii?Q?04o0VefOzbjRSTWEsl2ZiST7y0XskcLEOi7aSvcw1yenSEeqiJE4xkwteJ4l?= =?us-ascii?Q?ncom3vRLBlYX4QFMyTBo+/lYAHBgyxwZjwh4UZm9ATqtq666amgScPSFgKo2?= =?us-ascii?Q?g7V46f9cAVfbzTWoNGUUj5m+zpq9wRzaNa4cTkILzilA+GSYifpz04hOCUqV?= =?us-ascii?Q?Uj1oQjYi8sNgCW0fq8HX1C6pZIRaTqBRRnbd7Jar6dgCx7OAZcxoeGD6Q9ji?= =?us-ascii?Q?EaoRmL9f3lXuhJG7jKoRBiiR9fmffZU8eDiBlSjvuRymSBSB2E/kwB201PW1?= =?us-ascii?Q?blNacRiFFwRNfWS1j9vYOLg/60jijbUyzBcg1XLXr51jQxuALsCC1+MX4bJL?= =?us-ascii?Q?9CbfEUOmGsee+mbOVZxVB8fuyZ5g8+zUo9jGoJsyPwAWMtyZutk1K8KjiHoR?= =?us-ascii?Q?fJsxzkeSjzFOhL1YAt0O8hcSb9khjxlEgW0zRiw5mpHtxsw5OhkReo36ol+/?= =?us-ascii?Q?eakwUp7w/OHfDHYKsGqPDOv5r+yVG107OBdSBWc0D2Jr1811IjR8RGSs4R+3?= =?us-ascii?Q?9lgip8WFGwaDyeDGezaIDwrelKwrXmz/+rzmtsThWezHr43cooKnjoOaXcUN?= =?us-ascii?Q?oUPzTB0MAc6tfrt0=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 6:D69/FwsX+0dIlPUh89573tzLexpCoNzDbb6ETPYNT3+BjAMhzdvxShbzzi0Rppo0BXNhiQybko/O5HysfpffKrwXZ3hTQhx0kLqJXe2LKNs/HjGNwaEAR0DYZBo350PeCOFEDWbNPvcJZGGUrRUZSG8JTFhxNHbNl592wFBca2l2HZnwj8UmJY6yOnNoPrg1WzkVFaPPJwS7q5Om8fzEIr1ST5qTbqLfHn0+4rdCY+TX1F7mjKJ8M+XFKZfBBQ5ADY2U+qbPjE3JhxFh8mc+M5Yhxe6IxHt1AoNvPu0et6OzC36RK69LXa5rPetZCPoD87q+JSzCvqbBe5jCfpzrjVzSnoNTkeNFu4SkQugjdBw=; 5:TcSvG4z/GnFP+O6fMtJvaimcAp3zSZ4PIk6Qf+yNLWwXqIdYSikKQLaPHJy3ZwULM6Q/XQ9rWVtYVXZxtdcz1LIWfloJwQjt53s0Qc65yhwU4QaKE2fwh5+iWUcFo0GdRQjTQTvRER23l+OH4YfXDyv7zUvygEIEVXjhjH2AU3Q=; 24:upT16XCrf+sqe7l9wBHj8SoQ1MwMvEKMx7oClwL1URdwhOWdNlyn7ldTAyuXhX8QZx7zVGyqmOLVV3NdIE+88+1DWe1z/nzoG4A8v1Yuif0=; 7:Mt46DokC6ayJkelielEOUMrY6jYZodd1To0JHaDD+hHDG87zNwu1U6pxrAQ3eZdbHlMoDbnKyB2E85QSrJkf3bRdetwvhtnPKUk581cGqtKWe9Uq5UnqIIAvG0AJKdS8bwjObxwmT80MFIogofRkuEsOPMR8waaMifBCHN7jTSPUXgKi96T1bDKo1ljY4TuR1C6jX650WGMTrp/dBevIMcsnJ0WmFEoRQiL4i+bU9VSTQgiVdJcMDjIy2A+aF2lV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:lmL4I2AlvO7lOzYPRr4/kOGSRjdmzQU2DGYRkQ9MojzBcQXF2379OktznlG6h29ndE5w/BWjFC2G2LWEx+4FlGmhIoXeztr0BJ+EcaplI9E1+5NWO9ra75CewR/2gkHi0w1fdazVYclyKjbA7GFitPQCRa2xKAVxbzBNriWJIq0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:03:32.4454 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90601b48-416a-48f8-7644-08d566c4e193 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1876 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 021/186] 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 -> .use_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..839aee3 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, + .use_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