From patchwork Mon Dec 5 15:36:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawei Li X-Patchwork-Id: 13065842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5DB2AC352A1 for ; Tue, 6 Dec 2022 13:58:43 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8EBB618D9; Tue, 6 Dec 2022 14:57:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8EBB618D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1670335121; bh=sx5+KXUP8Y+FFoz03b8FePEJmkx2XTNr9yRPFUuTYsI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=a6ecoH+u2bFXlHSODjBBiZqaOl+P5SPynCDn3mMgWXI4Ku1Z+wg4yImhXyh9DHpYE md0wZn0dgAYHOIx5C9dx1HgpSqm2evDDJ0gYhHr8BdWO4k7DIZOkEK+XO9eAXBPwbp 5Q97uuC2PJEOdXMN4n+DUQq+0S5yU1qYHhoqCBOU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DD1FBF805E2; Tue, 6 Dec 2022 14:53:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CE135F800BD; Mon, 5 Dec 2022 16:37:35 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2082f.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::82f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 17B98F800BD for ; Mon, 5 Dec 2022 16:37:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 17B98F800BD Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=outlook.com header.i=@outlook.com header.b="goRXTvDY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g4qbe3q5GUm3+djFxGLY0FHhc1fl94A/l/I18KWxQS6c5a7kO2tpTyGpSuie1zbjsCQNn9dbs9uVCDgPdyDRtrHBT48xOFmFULzB1Qc9MfzUMJkxMp7o+Lqz3/LHrrkp7lymZSVecOjeMEHb98xgQBYeeGsqDpECIFDY92iLZi5ypPKyF7w0DZIOrwWhAest8gN6Xf5p7fK7MSNJVAMT2nXGsBpQricxVYTvq4V7zt3II+puSDAHPigVsDKWQfJlNr3SCWIKUw3QeNVoNC5pJaBhC7Un6kKmWhw1pueqR2djj4K6NNsOud6KyMjwv5Q/ZCpDGqYNZqAqmtYcRY2zyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=C8XYQmGsFxifbE4krxLLsTBSxb5z+JZd35HhshTCv/A=; b=PVbUPuKlXpU8REE3ZpCaUjuZ3sBGMksG2vWr0nZGL5vng74+f1al3/NJnthVtJQH4ErDvVCcCFdulvDhhvtIzYqyokZlyOJPJT6C8l4NNiXs+7vhqjLRLAl1HDCzPMS+vlJMs6sU4+2/or7kU48KLVJrEEOxN4LVvE8pJyeWjlIq3boBxodptcvcHM2xw/6/XGVRaNnCilHUUSDhF88k6xR6PdX+CLixqd4syZu47HCz7cAKGexnIUqV+rcHGpvd/XHt4CuLT5xc84+m4NqtbvHacQhb5zXSwKgPSPWChHS//jX5EbTPQEiQXi7cJUjka0CPd5zwH53chDLTeNB0ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C8XYQmGsFxifbE4krxLLsTBSxb5z+JZd35HhshTCv/A=; b=goRXTvDYD25aH8m7HwC2u7COsS9oiRP7W8ZY6/pyNbXG1qxHyqFZQwXHuW9vCqxYezW91VzZ3LjTmPMOxBsD7Ojn18A0wfTrpiETCol9gT+xBDNiC/lWBeklU50P4qKYWXA8wjFpvQ0eCY9agiB/mr6uTf6dJ9h6y8TeEKHwmbe7ZfB3Z9lia5TSzgICj/PX9WXukyPMrabJs+2zVk1uCfav3TIr2k/yuKa7Y6Y+ERPaECEWYU8LIRnXz09J0f0c2JRMKMy6edQv71wUvf2am/5gh+OgUCaqS/ynTQNr2tvWZugwLZLjAbi8oDCkGoy9lXof5+JzIbDEIULQhux2Wg== Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) by TYYP286MB1787.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:f9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Mon, 5 Dec 2022 15:37:22 +0000 Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605]) by TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605%5]) with mapi id 15.20.5880.014; Mon, 5 Dec 2022 15:37:22 +0000 From: Dawei Li To: gregkh@linuxfoundation.org Subject: [PATCH 6/6] soundbus: make remove callback of soundbus driver void returned Date: Mon, 5 Dec 2022 23:36:44 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205153644.60909-1-set_pte_at@outlook.com> References: <20221205153644.60909-1-set_pte_at@outlook.com> X-TMN: [WWyl4X8Xy2TdiUTL3/a5BJJAkOeQUgge] X-ClientProxiedBy: SG2PR02CA0046.apcprd02.prod.outlook.com (2603:1096:3:18::34) To TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) X-Microsoft-Original-Message-ID: <20221205153644.60909-7-set_pte_at@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCP286MB2323:EE_|TYYP286MB1787:EE_ X-MS-Office365-Filtering-Correlation-Id: 54577305-65dd-4f2f-4d1a-08dad6d69a41 X-MS-Exchange-SLBlob-MailProps: /OoUGmN/RpVKD6y7RJd2fRTadJ6Pq1ot8vlKKmA/hNHf/9uXSEfxNcy1cE9dsFBTSU4rE2OHL/YSf/94pMqv/IC1U95CqFfOvuXoXCzOFsq1S8gJM/GNIgTLxNY8CXbn/hAfm9S8eI+3vaesaIP+Rv2/iB3t3j786KjU5NDoaNXNpP2SfqwiA0VTUzZS9wqefozxmQa1Qfnx/DdA/NqHMzcmb4WkUbWC9wk5Un/UBg4FPZE0RI1leoxhJbyN7vLubLcR9pyi54bq2f0Qx+1nngufqtBcAQWC/XEFeyFrm9j90ixn9rsoofeIhdDAU3WJ3GQ8aGvm2E2lkO37uImtIraQ+SF9JEr45aybi5nuw6je2FgKr0F1u1G5B66PNid6IknTKzvgmHpynLEfl8JgMwOPFymajtHhhrHaDSkSjZSlmgZaI8i4yWBN+5ZNYSW6jlkD2+LtkfwY729x7PCuEDY2sY+b8E7bF/Pbahq5EQtQua8gutUhKL+8ScpGXqtTUvpC2RIm2SWzS3GwqcoPr16SkxnoxAq4cPCQd2/qToH496Br1VWVRnL2YH954QA8uY/qJED2TaQBDuB2WEzI1Gh4LAGBHuBZep9fMGcSvM/KNwkX68Yu4iW/+3gBQ3ItHzISBHDYno5UN09+MGuiOdDR+YAL2/0nFPqB0faWZ/TMrqM9JyEaPIn/UJvkkTxsMULetGzyGgXtsJieSeUYagPJYKaltdxKEYlUJWzsGBlpZv34x1Z4BVYAMdc+GL2U X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0zQ/1p94AxsYQNCIY71ncaAalqnIBL26GIUPx4Nx1LEit8C69gJyGYYfdv5wtBBt/5LkqF7FJ3/HcWJhztDzZQ2Q35BIYgTpl0iz8UnIgLW7OyfElPTusolx1OFrbX1kZjcd5R72BWVnuUdTQhFdQqx6vMUETus0B4h95CTTD4cH+s0bQ4GXl3RdC31Ak1X79Olq5kaKOoBAyooJVJi6ckZV5OC5YjguKt3qhfkpi7Mj50LgYoZx2gVHsz0kUDjQe6AGDaT+eAKXe2wvwfcmk5Vd9rnLS11EN+nFJ6X6lge+q0J3p5vdwNjAqgXc8Vs85E1oevZgHTyGrRIa7DOezgF8c1DaMxwtU3wBGoN0Sjm0FT3Yplzt1SHXnnT4KivFXSysvP71MkgBlY1AEyRx40lKSzI1A39XoRqRsis68LhqxbjdknJgEhpLnP3cpfaLlHcTlfZOTqI/ipvbjUUF8ZgR7cu7rFoyxkj7kSUgWLD+joX/U8N9xbsCrfwVAyWsDB7xfPHmgFuEqolRlfydckcbPtHbTI3/bl6WUqyNc/g/EFPHPoyoMlzv42bNBH+fFPbqgaz3H6DSj/+ViiUy9VPKRMdOMVybBrSWjYorefODeXQ+AiIUSS9Cln3Mf1CtZiPVSXmn4XQ3ADQz9KLoTw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y9FBxjtsf/d3x6C+Cbl4Z7xezNuEyGWC64Z3rvpZ6h12emPWw6ZNgonBCu9je9hbNhkhGUR6M7gMFntho3lmT+tswhmZW7MuK4Y9iHwcrwikVYr3J/2liZcDBdZuksVpnxij4ZAp2Y2O9V/b4/uuXPp1A1+6Pqj95AMqSO6wKqrTJh8uB0SiLjzDvdXIawHHEAJdMXjPpJORT3pGEnI4YxdtkpRwV/1jXzA+W3oVEBD4tO2S3Ov8wMr10c7FeJhB2E9PDqutd0P9OFwL7brgV1/G7aDSw9POMkACI05CRibcs/YRMi0CQoq67VFzZJeJ/edxKBzbPkjP3RZuGopI8XkQZ5o5lYbIMoZG4Ojn5uJFwfthlCJ1Re6aD3MN/l0m6PaAypeHLQKWwiu5onXx09mmIXOvcjKlEsrgwbIAOvCHcuDOs/NT2OvefotDXZ2pibo+4u9p6arI0UB+S08g9nBOW+rV4YVmEd6gnoNfL6WDfJCHV3/5TsLAx0d1qbPwykL4KFX13KJZvny4jlUFDk2nLktmHJdnoW77QH+PJxtzPHHADiJNgA4Wa2rNXHrXqaWmjwBrnyWp+/gnyXVBVrwWbxtJwgCxoedb2kc+Y60R304N1GrKNXl8L7skGpf8stX4BLBmzJ4KcjPK0HSPDQZ1ym2KWwhhN7rpWAOui849zmhu6q5EYd7IQo2aZl8SJkB24QRa/TAgfioVgzR3imIJ56iuoD8gMP92WQMVDsvjHmuqFW78TfHl538TuajkgS/cHrNG1Exx10YISMUN0pXgpwS+a92G5+J2cKNwixh6Sn8VQRIGU1dvPQuXO6QEDIcU9pncwiBpOagdQlA5M01X2pFGX8Nj/pgoZMpXCd8suT5+3kC6rBqNwWzdIfuuvbk4VjRktKthPnjRzj64racXptvKaFtwzpj70v00xypt7i5VHTPO6rmI/Yu8L9ycNP50av5UOZUxDNTxSJVD/UBWo6zwxthv9lWhrktxI+QmmeQJ/6Jaj/lT7aeoh88b0EsOwUoppvWv9kr7bBm/Ls3OkePfn9BueMrX9pwi7QYAJUPZw09CGL9OJTnqBz04wFUogMjBcCjHb1rRnQk57SpdeHwY3aX4sP67vDiHoubFPUp7dQ8d2n7Lbod3N6gvzmJ+FF3hoQG+8RQWCJoIMdfTg63LviXSz0gBiEIeDmCYu2ZKdnlA1vFw5Oxn07Xjd7LV+oXw/Knwqsw4uTgzFtUPw1SnAurDXyXOyzs/IrumHIJHI50/Mb+LGZGpcseB9SNY7nW6fPpSlk/WGTKzAg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54577305-65dd-4f2f-4d1a-08dad6d69a41 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2022 15:37:22.8631 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYYP286MB1787 X-Mailman-Approved-At: Tue, 06 Dec 2022 14:53:23 +0100 Cc: jgross@suse.com, wei.liu@kernel.org, sstabellini@kernel.org, linux-hyperv@vger.kernel.org, mpe@ellerman.id.au, haiyangz@microsoft.com, linuxppc-dev@lists.ozlabs.org, decui@microsoft.com, alsa-devel@alsa-project.org, npiggin@gmail.com, linux-kernel@vger.kernel.org, oleksandr_tyshchenko@epam.com, srinivas.kandagatla@linaro.org, christophe.leroy@csgroup.eu, bgoswami@quicinc.com, xen-devel@lists.xenproject.org, johannes@sipsolutions.net, kys@microsoft.com, robert.jarzmik@free.fr, Dawei Li , roger.pau@citrix.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" Since commit fc7a6209d571 ("bus: Make remove callback return void") forces bus_type::remove be void-returned, it doesn't make much sense for any bus based driver implementing remove callbalk to return non-void to its caller. This change is for soundbus based drivers. Signed-off-by: Dawei Li --- sound/aoa/fabrics/layout.c | 3 +-- sound/aoa/soundbus/soundbus.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index ec4ef18555bc..850dc8c53e9b 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -1094,7 +1094,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) return -ENODEV; } -static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) +static void aoa_fabric_layout_remove(struct soundbus_dev *sdev) { struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); int i; @@ -1123,7 +1123,6 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) kfree(ldev); sdev->pcmid = -1; sdev->pcmname = NULL; - return 0; } #ifdef CONFIG_PM_SLEEP diff --git a/sound/aoa/soundbus/soundbus.h b/sound/aoa/soundbus/soundbus.h index 3a99c1f1a3ca..230dfa1ba270 100644 --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h @@ -184,10 +184,10 @@ struct soundbus_driver { /* we don't implement any matching at all */ - int (*probe)(struct soundbus_dev* dev); - int (*remove)(struct soundbus_dev* dev); + int (*probe)(struct soundbus_dev *dev); + void (*remove)(struct soundbus_dev *dev); - int (*shutdown)(struct soundbus_dev* dev); + int (*shutdown)(struct soundbus_dev *dev); struct device_driver driver; };