From patchwork Mon Jan 29 03:53: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: 10189015 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 539ED60388 for ; Mon, 29 Jan 2018 04:28:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 409C228783 for ; Mon, 29 Jan 2018 04:28:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 342DD28786; Mon, 29 Jan 2018 04:28:04 +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 51A3228783 for ; Mon, 29 Jan 2018 04:28:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EB5B126775D; Mon, 29 Jan 2018 05:24:15 +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 4598F26771D; Mon, 29 Jan 2018 05:24:15 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 983D326775E for ; Mon, 29 Jan 2018 04:53:39 +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:53:35 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 4890E40EEC; Mon, 29 Jan 2018 12:53:35 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270912501" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 12:53: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=7oVr2kHyUidIouO7Te0nIBLYs8hHLzshD8LXNKEgKkQ=; b=W5btGQcpTjCkUaiOUHeJQDDJschpcJm9wwIwfqpaW9W0QwcdPQHKTFOphEpLeXowcnH917rP3+IHr5ZfyHAjOJbxoExwwAHMiG/vJIFgioDUJKCaFhtVm+94QXhUNpU/J+LZE7OaZ1vSuevVe+Or9w3jFY+T9A1WuR8GDuqNm8k= Received: from morimoto-PC.renesas.com (211.11.155.138) by PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) 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:53:32 +0000 Message-ID: <87lggh1fwe.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:53:32 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0098.jpnprd01.prod.outlook.com (2603:1096:401:d::16) To PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 24b19000-6290-400f-56ca-08d566cbdda2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:PS1PR0601MB1881; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 3:x/3PTPWuB7u9xglYSDlPLZIFL6/GkZK9pGvfRrSDY2kF0Rek9wAZ5A4PSnT0IP7EEYALtB9uCgQ1yYeCotSRFK37g6JwEudmcGj7FDCPVz9CjuvVDEvBpg5FEhf02gQsK+XQZftFT8+QQ2YORQtbNm83vK0phhje7tKYTk15ROOLLtekhWwknGmTsHMtD0NlJSgy8BHRJh8BSVqxFfz9nATovoUhVQT6Fq+hqqFMzPq2sn52XI9Ee39uRqY1utrv; 25:6FfslJM7cxaKS5AHKppq22o9R58IcyQ7nGUBXDkpofhPfIgPOJz4JSmMeGiLGnh8me10yN0KIz/IRD7n0XFu2M+yoQhmNgTkIxeYeDA6dCoBvaduRnhjoCOOQ0iv0Awh0cIdVbdeTdOgCTEJkoOIwJNWampzE/vchntoHRy/GBFNAf3kBFabjDbXNGLGiWckoVLqVwISFTdDrM3rhq9gZeDpmJmPuTnRDzgRdqX5E5az7t+KgIwO/xsOlfdwWO1+/pAeMbIv5v9N3rpts226jgPPQBqeCNoPibSpqiFO/bgjJuYCuhwvUl3ZFBbOM8vhf+cePWOqqlLbQeJ7irMc4A==; 31:bkdy4eogTXlfYRsM4UYnYxkMOGSZk3je0/Ik7zBevKW/S42r9k4uiQZZu+xICev0l0FloEBmAUJLRKvAhzVQFYHCT2io6doX/UgXc5EDMzH47RalWtG/uFuSQrYw9ZNFLppBTtpbWqjZImrhTSpcd0nbRhUpsxZxIq0LHBDlqohezBg+S/+VguytsU2tj2emAGgEJXMjvwRhm/FE1nGXQfYO4yjdK4y8hLbYZejVwXc= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1881: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 20:oAMsXx1NVegiU12EqJ+V38U4C4uSRCKrwyIvzD9Xa9g/LnlT67V/fjne8jqu0mQKSq4mTbcKKHRLpT1RbWwaFf7Z+n70lqNVZb3dGT0CPJUuAWYMOY9ZvicV9EAsw5RD3ZQQJW4s9+5Uzi+WQSTwi6aJqzW6hmAERhGb2Gw579A4gvbaNAhacYYpwGPjAnK4CM9xX2TxuGCH69rkdz6pRiJT5xirRzRTetbxNfvKBDO9bs42r8kt2tEIc91LQhXWzrhOAFCaNVCNb5hHUXH1nUe8MKxAxVKJOvdrXoMXlfsthrgn0Wck1gsCRRtBUMBYnV0NayL8E2Lnv7Hk0QxsoaMhxTwDUXX8G6AlAXFGPCzWHjEUzEzWYyn+fOAq5e1V4OsGAl+Z3WK3lX72pSXcmIgnc0fAHfoNBqpt8DcaMfkdpXskT7JkTOTfqw0VnYlQiNWZZmD9jzLtlrLB2MfVBkJIUvQhZIOYoSiw/U4pBmcjDQpBBcA6rSGPvmPWXEkR; 4:h5zAH11PkwmYWWnRrsB8d50GVcEyHxBULQQWjnQ2BTlVayCEQFAUVY06L9XXCC/P1pZ2MfedhoZq5TSZFmukgHfIpG6kBjSbCP9MTe5AsTSApqzc4qTx09GBctftd0XR8l7AZ7alipyAl/wwUKvkCMuLkyhhDL0C5zwZnikZe40WqQOnnGDN+lChaOQXhcQXt7WkPdg2w01fp+suel4uFWjKK7eT2Wi9lfXi4rJlQaEuLXykxeaJxReWkAeXw/KRBHHM9wOVZFgsKTknvpxWgLaxQf4zdG4Eka8HEJCabXK2fO5ObQc5GxdzzWsQ2ioy 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)(3231101)(944501161)(10201501046)(3002001)(6055026)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:PS1PR0601MB1881; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1881; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(396003)(376002)(346002)(366004)(189003)(199004)(69596002)(105586002)(66066001)(8676002)(16586007)(58126008)(8936002)(81166006)(81156014)(478600001)(316002)(5660300001)(97736004)(53936002)(76176011)(36756003)(2950100002)(305945005)(59450400001)(7696005)(2906002)(52116002)(386003)(6116002)(53416004)(47776003)(25786009)(50466002)(6486002)(6916009)(7736002)(83506002)(106356001)(26005)(68736007)(575784001)(4326008)(16526019)(3846002)(86362001)(23726003)(186003)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1881; 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; PS1PR0601MB1881; 23:m6FIPunB+N/hgtDOJfusN1BPTrbGgqckn+N5QgX?= =?us-ascii?Q?McB8ds27TmwdvzXiTpVlb5HJjEMfU5eZXW8gu5trq1WexTwH/g6bl6tIUOTv?= =?us-ascii?Q?8VrmB8J6z4lGuUe8wEL5yuGPgaAGIcf9ydyM37AI1ZmGOG4pTLX9ryO/Dm9G?= =?us-ascii?Q?8ycsIX9YKFBKhcFyasfhjmLAREhQmlqGchj/Goj+jdSwcj/6qMrei6HNHbAE?= =?us-ascii?Q?LoYjEB6GGa5rpRAHxJQgScAgxZOV35WwChXX2qUnmwfmq5//1mBTpkHrzkJ7?= =?us-ascii?Q?Ad3qNWR9iaen5VQHDlyuEyGcGwh1wdkAi2WHtKSCVoQuPJanMToN5QrKc/6q?= =?us-ascii?Q?v4BeQfASq4vwNk0wLwPqmuVEtEfYGila0aFfpcutiyxIR213nRP4BhXY1bqv?= =?us-ascii?Q?CHcYg8AqW0b3X8I4yOmWKf/4Z4zYdt67RmlqOB+On5h84JHWadWEtkAE2ZIL?= =?us-ascii?Q?R6QWbmERHPx32l//xqiQfTtf1VK8TntnFR2EIN/239pcUlD6Q2Qy10Rv6le8?= =?us-ascii?Q?HesOzonHSO7T+QcZXYgRBsDfclJ12FMEyKRe7OMci4vs5OFGY/RFavKP9U/2?= =?us-ascii?Q?HiOqbGH3w6j+n3Z7VMRNUZuHZH1iQkhMsD1hRpiPFoM32wO4tG8gXlFPu9KP?= =?us-ascii?Q?OFpBxD7ub5SbVbQOeFr4U3+FyHYi1YBlDaawQ3lSAbaGhTkesGaosdNuxn3y?= =?us-ascii?Q?uB0ywp36xHTXFICFGm9DsFJvEAoX8Bplgxwu7nZ9fObEf1viMr7z9uT+S2O2?= =?us-ascii?Q?cl60HpuyhuOQzA387VHpNYJ2bTc5fFRIHYyc8NE2Xn4VMbr1Edez5QTDSO29?= =?us-ascii?Q?YVxsYimhkid56gAQcjF8yjNdyN4brlGh7QslNkcqfQL01ykwz053Vx5m0RCL?= =?us-ascii?Q?d1O4zWWKdVp4taHTax3+vTVc6uLJLXTX4u8tpOt7YkVvvgVHAfm+LFFeJNji?= =?us-ascii?Q?kd8RLgjXr6uACIZ9H8wP/Yrbjpq9f40QDHwh9h0boH2qQz7UxyZGpWKNYlvE?= =?us-ascii?Q?CSa1Y49zCfY5FVs8T11xejqEqib6hM4y1s0dQz0ncGQA7n2wxdDp1G+g8Z7p?= =?us-ascii?Q?ZbOll4DmibCnrB3gG2kjafZ88KWU3KAwESMzuLIjP+WAhmFcmGeU5I5ht0t6?= =?us-ascii?Q?mhiImjS5e26TymZB3vvSIFuKu8q2Ir0KCL/dStBTosVXlAu/pWVWLugrL+yq?= =?us-ascii?Q?ZVANAMMTSSCZGzNSizhgS/IV7oqmSeVItfyiC?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 6:qpnPytjl/hoQ2CsmWctH7ZUrSXXswVYKOpYCIAzgxQjQ+AuKGOoXCe3rpIhCWl1cBRdXGCMR4L02SDcL+kKcDmJMz7mdCo1kt0FILU6Cdowu2+gokfZeoHzVQpvM/MQqEVBgjvI5mpt5/yJYitqHceazsmmBHUFXSOu3O5eLrhhXleNPWNJ/E0c+iW7AtiMUoxmy0LQSFixyBCmTOeyjn+TK+707SpxAumDsLYP3qRN+YAJlyK0MyKncvIkKctuAlaVuxHtZ5ol802+JX6saoK64kmso6eTG3H/0JH8H7G2p2rJV8fc9LrQ1eKfPC9N5SBq0N4rDyPat/231XXMhdNQB/SORC0nEe32z+Ut15pU=; 5:3q/mqr7xkRSRkMrYY9ec379VC6DPGFvggvWgj+YJVO/iqUbNwa0yEgDZn25JvXjmgQbswklACdOAroAo5TZ8got/tH2l0ORfwzO2xdT0D15I7CTj+wsLxvHi0EQIrqdKOhfWCVKpyG0IeQBthZMgklzcIIbK6MVZmmKysG+fDqo=; 24:Spwyd1Be1tEoMvJU1YvAMYAnhR2i+YlgWbEpErhB3Bnlx7oa6ORKG8yNtTxbwVhx36DbjGM9nvhunp+fhNiLD7yueuyZ2lexV+U4UVWkKXg=; 7:e3kf3qrFMPNAoFhot4v6OB2XZfHbsWtD0qEm3b0Dg3g7DwoMwHBTSrwrb/Lm+j9ud3gI/djXuJ88uQtVQ/sDNrVMFyjutLPO8Vcuof721YjDrAQEARUcosxvpaaS2ffevfmF2ctinYmX9wgZkXGwnyalUpZrP01GHm7Px6IAMu1HBFo7b+h9oP2QEB8pMsiiQsPPYlXYeM5dTPeSxFtMvcH9OQF+A6kA14+OsQ+Z/LtreZzA6kfJ2XLqm2yhFwZ/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 20:G9sGP/MiXkomMZ36676ek0XqOqah2y3InGDeYdrj/7FUzQ9ftO6rNpRybk1j9dw44borw5BnKdrysVW6y4nS2Cl3uMNltCNFxHfKvJ9FVPLqUUmNJOyy/SDP30jdBdVDPkUT5EXdHjIlfI3vFoCM3GHLZ3Qn+faE2+FtJqlgIlc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 03:53:32.2466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24b19000-6290-400f-56ca-08d566cbdda2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1881 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 072/186] ASoC: cs4349: 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/cs4349.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index 0a749c7..bee0e34 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -74,8 +74,8 @@ static bool cs4349_writeable_register(struct device *dev, unsigned int reg) static int cs4349_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int format) { - struct snd_soc_codec *codec = codec_dai->codec; - struct cs4349_private *cs4349 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct cs4349_private *cs4349 = snd_soc_component_get_drvdata(component); unsigned int fmt; fmt = format & SND_SOC_DAIFMT_FORMAT_MASK; @@ -97,8 +97,8 @@ static int cs4349_pcm_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 cs4349_private *cs4349 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct cs4349_private *cs4349 = snd_soc_component_get_drvdata(component); int fmt, ret; cs4349->rate = params_rate(params); @@ -126,7 +126,7 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - ret = snd_soc_update_bits(codec, CS4349_MODE, DIF_MASK, + ret = snd_soc_component_update_bits(component, CS4349_MODE, DIF_MASK, MODE_FORMAT(fmt)); if (ret < 0) return ret; @@ -136,14 +136,14 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream, static int cs4349_digital_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; + struct snd_soc_component *component = dai->component; int reg; reg = 0; if (mute) reg = MUTE_AB_MASK; - return snd_soc_update_bits(codec, CS4349_MUTE, MUTE_AB_MASK, reg); + return snd_soc_component_update_bits(component, CS4349_MUTE, MUTE_AB_MASK, reg); } static DECLARE_TLV_DB_SCALE(dig_tlv, -12750, 50, 0); @@ -255,15 +255,17 @@ static SOC_VALUE_ENUM_SINGLE_DECL(softr_zeroc_enum, CS4349_RMPFLT, 0, .symmetric_rates = 1, }; -static const struct snd_soc_codec_driver soc_codec_dev_cs4349 = { - .component_driver = { - .controls = cs4349_snd_controls, - .num_controls = ARRAY_SIZE(cs4349_snd_controls), - .dapm_widgets = cs4349_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cs4349_dapm_widgets), - .dapm_routes = cs4349_routes, - .num_dapm_routes = ARRAY_SIZE(cs4349_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_cs4349 = { + .controls = cs4349_snd_controls, + .num_controls = ARRAY_SIZE(cs4349_snd_controls), + .dapm_widgets = cs4349_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs4349_dapm_widgets), + .dapm_routes = cs4349_routes, + .num_dapm_routes = ARRAY_SIZE(cs4349_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config cs4349_regmap = { @@ -305,7 +307,8 @@ static int cs4349_i2c_probe(struct i2c_client *client, i2c_set_clientdata(client, cs4349); - return snd_soc_register_codec(&client->dev, &soc_codec_dev_cs4349, + return devm_snd_soc_register_component(&client->dev, + &soc_component_dev_cs4349, &cs4349_dai, 1); } @@ -313,8 +316,6 @@ static int cs4349_i2c_remove(struct i2c_client *client) { struct cs4349_private *cs4349 = i2c_get_clientdata(client); - snd_soc_unregister_codec(&client->dev); - /* Hold down reset */ gpiod_set_value_cansleep(cs4349->reset_gpio, 0);