From patchwork Mon Jan 29 04:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189139 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 CFFDB6020C for ; Mon, 29 Jan 2018 04:48:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC1F11FE82 for ; Mon, 29 Jan 2018 04:48:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEFCA2876F; Mon, 29 Jan 2018 04:48:57 +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 A03021FE82 for ; Mon, 29 Jan 2018 04:48:56 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8532B267CDB; Mon, 29 Jan 2018 05:27:29 +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 B4F48267CA1; Mon, 29 Jan 2018 05:27:28 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id BABA926788B for ; Mon, 29 Jan 2018 05:23:49 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 13:23:48 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 558C870AB8; Mon, 29 Jan 2018 13:23:48 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269595910" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Jan 2018 13:23:47 +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=mJzAEpdKTt8vmup4/JSh0JJJchhVoRXcwsMEq2bbYo8=; b=jZESnl3ddkaboeR7SZUc/IFH6kYI1r1X10k6/+ldpvQSmcYYM5ECi59mYPTJdvU+7uwaRU/KrEE95Cq9KNoB02jSBRBEvzXLr5+MjAOI9vexey58rEjTf/Dhv4gqg4EhimzZoYfTbRG+zfn0hEPx96MFp0aHWbLJqouCkNHBgb0= Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1875.apcprd06.prod.outlook.com (2603:1096:202:a::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 04:23:46 +0000 Message-ID: <87a7wxxpj8.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:23:46 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0156.jpnprd01.prod.outlook.com (2603:1096:402:1::32) To HK2PR0601MB1875.apcprd06.prod.outlook.com (2603:1096:202:a::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d5080cca-2eea-46ff-e5c0-08d566d016b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1875; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 3:78FT468azPVbLYbwy0MU1IvriHrpVv7m9aMyF7Gjv5gGC9GgF57bkKIza2GHz/vTc8QjT8gNwLkTRoFRlUvwt1XqnXoBxJ5fx7d10trJ4Odw+8EuXCWdbugBeZzbW3t97dlQ+aYL2g2s3nrifLTMY6brZz4j394+EvtYVbrzB1106c7ZtT26ep2GnNd+tgAPJMJVaYcDqXOHpHu96QB7CyK/kl9Qes5cM+08vRJLX9nawtSOfrOr+7QirGa6Hk+B; 25:TiNavZVzW8H7C7gXgyyvZh+ypFu209Sz18WAUFeDFykM714FDrW7dbk7rclfe+ZtheAWpbJUMO6ytbYMhepv216CBLrjFyjm+b1bvJoaLOeTHHCESKIQXLHaXJNtnKlBXXuWGlMRFiBxvIs9W7z7whMKgEUnU1bsrWx/i+DA1R/zR4c1R7aT6fNxoA0j1JMoJ6zwosOwKH8eSqxCG0VnXwXfcweRmr9y4xNFOc4Y+BzLSw50zI+IDmR/FOI02QNMMgzgg/KI4HwSccEDem8hZpofUZAsvcRVL8JbEF0eug7y35oRAbDuxUrFvT1ObvEITgPOiKaPT6z4W4NpeZN/1A==; 31:fBHWGgu7DlF8DqZPzGQgvDVfkuZv85JR95AOvzIZ8iVzxUPDdK3vjKE8HD5wbkJeLGHbz7QGVwEYXAjw/UsTFEthnb8MDIEyuMxPPdKTxIicPXI4kdDb6wO+OenufoLqkWv9tNVdtnNwuIuuiMgaZDUK7bdSyjVJQgUgZEzYvCmsTN+lLn3a6YGh7LEihyDf0leQIiC7Ql9H++RpvLYACa4qPJM+B7ouYjAdB9SUWFo= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1875: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 20:D6FnoYATfXYxBU4d4mKcRm8IA04CVaJhtM51cQQvBGXod1LEHYJtociquYxhHCqMyEWOlKRZWZ8NVC6jOEUXMJlxFQ7xVg6CmWsEqlF/zHbLYoyXCdlfnn1Bcww0zF4OxE/zTfGyUtkI5jjoWBJ+DpeexUeSoTg21AZ0YxfXCdV2C1S+UOOBAw1IrEa+npdQQjmqbM6S+LYMwJJ69sB3foVX5EQ5UNaxJ4OCyvB3+fG0RnyyDbfRDKay29z5kWVFi62aE59lTdh/dTFlet6k80btTcNr+ybrkA7ZzHYljz1jrZmqFRBLmfn/4DkZnY7xuCWkA8PxJsb5UxoLy+zwpT4UcAjf8AOaer35CXpi1hRzh/7z1DM9clSj8fHc61IVQISrFedROywiLiZLP1B9D9LtRV84BhRPZNMtpZo4o1ZIsdnP+cbfTTcBhaga+TM6n9r1DbYW9hRoSnDQ9V48/ACKo2gTcsb5XUjYWtQ79bfpIkLUKqO21y3yKFPEfxHv; 4:y3RrQKjHmgDSPtpOQDfAGk3WRKGblSBENY8IFN7zfmuht0WiIeOR94KXFTEAVavw6D/htlsDlnljmSKvPMSMUmZVHy7zB/8Ac7kjL5eLb32TNRX30BHCkW2G73eVkRtY/QLmNNU7VJhl1MpJxRJ8OoU1RBV9i0DEssdTBBSutFkNzf4d9dAfN1s4W9IaVs/eYTB21Y+uGlEIteELnhOYryuDfJuapiXZ8A4f8601iMXs9VjZa/Q728b1IUhEq/934Lm5n4gm61rP8QZOCGPwv0xwCmE8k9JT7NV8T/xX1cmnhOfvKbu+wmfKDWSO8he8 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)(3231101)(944501161)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041288)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:HK2PR0601MB1875; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1875; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(366004)(39860400002)(376002)(396003)(199004)(189003)(6116002)(3846002)(26005)(36756003)(50466002)(106356001)(53416004)(25786009)(58126008)(16586007)(316002)(105586002)(16526019)(86362001)(97736004)(47776003)(23726003)(2906002)(8936002)(81166006)(81156014)(68736007)(4326008)(8676002)(186003)(66066001)(478600001)(52116002)(305945005)(6486002)(53936002)(7736002)(7696005)(5660300001)(76176011)(69596002)(386003)(2950100002)(6916009)(83506002)(32563001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1875; 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; HK2PR0601MB1875; 23:rS+gAYsIPKukiohtmF9zu+A3GezQwmkhXiN6g+P?= =?us-ascii?Q?gwcgrQ/+iOan4P7xiv/chJEO9Bfe8zVpP6JIF1StvLoag1aPQ3Qu4xJHlhOU?= =?us-ascii?Q?YxP0qVBdxHTl/AlnwmNRyfnheesk9LMOMPI3cNCVlRR8QgZeUb3e84iT7a5X?= =?us-ascii?Q?sWRZz9sHBpkmSZPr/lhIbk11T3Qmz40kLzQGGMIP1p+XZJCg+9KdlRAD0+FX?= =?us-ascii?Q?8ouW2z71bJCxRtARJTX7xFTvgaKLBOM/15bLKHPGU5QER5QYO03zItZum+0w?= =?us-ascii?Q?ERm6kc4h0U1O05aPdOskE4dPcETuvUPFTKKt2LhgfgUlBAtNu0fAIUn6rLZ+?= =?us-ascii?Q?5kQyHLqD97UEz7xbQLUA8jjz/F1/rvS5Ha4im63ctwKJO18kVw+DqW8FazaM?= =?us-ascii?Q?k/fotBG4UTwetXA05uoQ2LLWPDkaolf/T/2IXHgD2ig2NTOGOKJMfew6o8wE?= =?us-ascii?Q?8tJikSfvLNaIMA0/5lQfVFtBgNlN0SPBq3qlPLuv8AuDyjDmDzq0CoTROGnG?= =?us-ascii?Q?GSYdEIxyfQQQ+SZS3ZThdPharwnXAkleZwSbvDhRoA9S8Bcei2JAhjTmu4BY?= =?us-ascii?Q?6qBdZpS9qtLMUfyKdFwkNux9n9OxORlQG+5ck/1fmdy4tv6YUyF5o1qVBeA3?= =?us-ascii?Q?acKcw1Y8/bqIv1SbZstaYlrSDmBSIGE5gln+qh94gDIc+tdO5EeXiHkhsZCS?= =?us-ascii?Q?R8PqsrONV5c3/ZSibN9CDEcj570xth2segXZxGp6ujzDxqEOZlpOJP8AT1W/?= =?us-ascii?Q?XegXj9gjqngyYDkuoMx51s0aBJkqHrud0km79DrSrnY50iZiurApDfjm8DFY?= =?us-ascii?Q?3A6g7ekAS+D19FX6ia1ranaFOwc1gjveqpr9Qw0DByG0bZyUUgXnhrPfo0Yp?= =?us-ascii?Q?KLmUeL32gMCR3/uV9aCt2R9sbPXXqvZ1m6twBsNdzMxz6dlIO9eI6jVWNPYS?= =?us-ascii?Q?R/XFTMVqMPvdn7NQcqldcNzz9Hhnxh++E9erXeeIPHEJ1SBjd8ogJQeXT8H6?= =?us-ascii?Q?8ms3FwpgYJ+UxKK9s4gPQBriSPxSqgaKgGJORIXK5uo6ZfXS+BDpyVm+9XUS?= =?us-ascii?Q?/VQjZw4+srj752AoB8BuTzELXd3aFQbxh08/63nrKJP2YNRP4aWFWD1y6MW7?= =?us-ascii?Q?vOMriXtyOusEIgRi9j4yLF8gEfejlGaZ7fagOunjPi2YoVL8z/n0wLTY3WQ6?= =?us-ascii?Q?LUEjbytiC+pNg6tc=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 6:qGk4ZtmBtMgdjFx+XwVeieZ1e7FAjHj/j5ZDlYikawLBCURzPDLEI0zuAt1Fe15siZxv9R0RSPDxx/wIP+H+npm4sKBq6/TrccfiqALD3fTqjmFgWef8dZOGC4zRqeuN9J3/9E3bdqgt4tLTp3w9Eu3msfnO/3yBeh5DmTQDtmTwnT19fV44tg1vtlHXt5EI+BJnImKp2cRlK7WT5Zi/g+opT4Qi3oQknvuMW/oBWtlpA0XMNiz8UxQc9tZ4YMNmkbVMQjfPgNdyraunhNIu+7PInoy3N9GZyW7wV4eJMcnA97Jyd+5zHbyiGszv2UPptri3jDnPMkoEmTV+3y45blOUtAgLO2n8uT0nblQTLzQ=; 5:PDtvjyzrh+JMkIF7CpF5gTwLW5mp3Q+Vtvz5maeeWJpUhtRZks7QwKr8laV6gA4oIeZUE8JmNDY4k/NG9o0btnWSzZaXED6A5B103KiFHuDaF75lAQ4F0PX4jWRHeJStnR9rEbA8df67PvSb3L1H4CnVZTXUGE5O8aQsFcgQMhk=; 24:UpDCSJmMZCVl8mw65hUcs7bcUIxAsmyJ3PFLxyE7/6EeyqsUZkBTKxurAx1tjfydjUo3Vf+QCVcEMDdt6b6kkHCUXm2Ezm0su7SUryMdeAg=; 7:z0pgngvooVza6rd/zJQAe9YdMaJeftOOkP6PFSlW5AFDqIL7c71Y3Wyvi0D+rRY48jN4laAZKU3b42yv2+nybGnLedMikbREf6jlIxaHINHjWy3KuLqNF6xL/pbJxbrw5ldp12H4GBt/W32E3gPT0EYm2FF4Z9vaItATTgZSe7pl5d0GsngSrW6PQ27CH3TIHJIE9PNHwVGUiceUq3czGdXf0FQ3uYOyYErY/dazbOzAF0rWgRv/D3Tk6yLjs0g5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1875; 20:ZmCWMlrCW3//3JEF6iJfKzVnKbKFdtmrX/HGZDX60nOnAmXsa/ebxZjJCMV56qpeJ5++zFRC7qFJPslHYSoDXO8QHyQ08oCHgIEovlwCt/WmCWlv8IZHQrLx6LVphIPRhabNzegPcnx43Xoley3rZGes5IU8DtmmyZohRNMAUys= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:23:46.0362 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5080cca-2eea-46ff-e5c0-08d566d016b7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1875 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 130/186] ASoC: sun4i: 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/sunxi/sun4i-codec.c | 71 ++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 8862816..9a3cb77 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -792,15 +792,17 @@ static void sun4i_codec_shutdown(struct snd_pcm_substream *substream, { "Mic1", NULL, "VMIC" }, }; -static const struct snd_soc_codec_driver sun4i_codec_codec = { - .component_driver = { - .controls = sun4i_codec_controls, - .num_controls = ARRAY_SIZE(sun4i_codec_controls), - .dapm_widgets = sun4i_codec_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), - .dapm_routes = sun4i_codec_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), - }, +static const struct snd_soc_component_driver sun4i_codec_codec = { + .controls = sun4i_codec_controls, + .num_controls = ARRAY_SIZE(sun4i_codec_controls), + .dapm_widgets = sun4i_codec_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), + .dapm_routes = sun4i_codec_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; /*** sun6i Codec ***/ @@ -1098,15 +1100,17 @@ static const DECLARE_TLV_DB_RANGE(sun6i_codec_mic_gain_scale, { "Right ADC", NULL, "Right ADC Mixer" }, }; -static const struct snd_soc_codec_driver sun6i_codec_codec = { - .component_driver = { - .controls = sun6i_codec_codec_widgets, - .num_controls = ARRAY_SIZE(sun6i_codec_codec_widgets), - .dapm_widgets = sun6i_codec_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun6i_codec_codec_dapm_widgets), - .dapm_routes = sun6i_codec_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(sun6i_codec_codec_dapm_routes), - }, +static const struct snd_soc_component_driver sun6i_codec_codec = { + .controls = sun6i_codec_codec_widgets, + .num_controls = ARRAY_SIZE(sun6i_codec_codec_widgets), + .dapm_widgets = sun6i_codec_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun6i_codec_codec_dapm_widgets), + .dapm_routes = sun6i_codec_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(sun6i_codec_codec_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; /* sun8i A23 codec */ @@ -1126,13 +1130,15 @@ static const DECLARE_TLV_DB_RANGE(sun6i_codec_mic_gain_scale, }; -static const struct snd_soc_codec_driver sun8i_a23_codec_codec = { - .component_driver = { - .controls = sun8i_a23_codec_codec_controls, - .num_controls = ARRAY_SIZE(sun8i_a23_codec_codec_controls), - .dapm_widgets = sun8i_a23_codec_codec_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun8i_a23_codec_codec_widgets), - }, +static const struct snd_soc_component_driver sun8i_a23_codec_codec = { + .controls = sun8i_a23_codec_codec_controls, + .num_controls = ARRAY_SIZE(sun8i_a23_codec_codec_controls), + .dapm_widgets = sun8i_a23_codec_codec_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun8i_a23_codec_codec_widgets), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct snd_soc_component_driver sun4i_codec_component = { @@ -1450,7 +1456,7 @@ static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev) struct sun4i_codec_quirks { const struct regmap_config *regmap_config; - const struct snd_soc_codec_driver *codec; + const struct snd_soc_component_driver *codec; struct snd_soc_card * (*create_card)(struct device *dev); struct reg_field reg_adc_fifoc; /* used for regmap_field */ unsigned int reg_dac_txdata; /* TX FIFO offset for DMA config */ @@ -1657,7 +1663,7 @@ static int sun4i_codec_probe(struct platform_device *pdev) scodec->capture_dma_data.maxburst = 8; scodec->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; - ret = snd_soc_register_codec(&pdev->dev, quirks->codec, + ret = devm_snd_soc_register_component(&pdev->dev, quirks->codec, &sun4i_codec_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register our codec\n"); @@ -1669,20 +1675,20 @@ static int sun4i_codec_probe(struct platform_device *pdev) &dummy_cpu_dai, 1); if (ret) { dev_err(&pdev->dev, "Failed to register our DAI\n"); - goto err_unregister_codec; + goto err_assert_reset; } ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (ret) { dev_err(&pdev->dev, "Failed to register against DMAEngine\n"); - goto err_unregister_codec; + goto err_assert_reset; } card = quirks->create_card(&pdev->dev); if (IS_ERR(card)) { ret = PTR_ERR(card); dev_err(&pdev->dev, "Failed to create our card\n"); - goto err_unregister_codec; + goto err_assert_reset; } snd_soc_card_set_drvdata(card, scodec); @@ -1690,13 +1696,11 @@ static int sun4i_codec_probe(struct platform_device *pdev) ret = snd_soc_register_card(card); if (ret) { dev_err(&pdev->dev, "Failed to register our card\n"); - goto err_unregister_codec; + goto err_assert_reset; } return 0; -err_unregister_codec: - snd_soc_unregister_codec(&pdev->dev); err_assert_reset: if (scodec->rst) reset_control_assert(scodec->rst); @@ -1711,7 +1715,6 @@ static int sun4i_codec_remove(struct platform_device *pdev) struct sun4i_codec *scodec = snd_soc_card_get_drvdata(card); snd_soc_unregister_card(card); - snd_soc_unregister_codec(&pdev->dev); if (scodec->rst) reset_control_assert(scodec->rst); clk_disable_unprepare(scodec->clk_apb);