From patchwork Fri Jan 6 15:17:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawei Li X-Patchwork-Id: 13091429 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 E3675C3DA7A for ; Fri, 6 Jan 2023 15:19:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 3E05E1472E; Fri, 6 Jan 2023 16:18:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3E05E1472E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1673018352; bh=7sp9toPRm9AaCdHYZJ+h9I0NGWd/vZffeyxcLwHxFXQ=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=CSheM6VGZvnkLxGLItXKnCkDZzfilsY5Sxn53uoMify8oZuHD7QRZ2NZek5FObHll WDBotCY9wquhfYTG+5MWtsXJzFonqqOCVhovocH8h+DI1GWcBO3/kTRRpUuD/hcHrU ntFrQZB6R141crzh0jXyutd0npFIMM4vxOTtGzLo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E64C1F80238; Fri, 6 Jan 2023 16:18:21 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 87455F8024D; Fri, 6 Jan 2023 16:18:20 +0100 (CET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2058.outbound.protection.outlook.com [40.92.98.58]) (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 A1F41F80238 for ; Fri, 6 Jan 2023 16:18:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A1F41F80238 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=outlook.com header.i=@outlook.com header.a=rsa-sha256 header.s=selector1 header.b=e2+neEcd ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CAXbd0f4Zpw6mHfUjwdfUci87Wmo0EgcBDEMHjORlCvALvDwItX5UydjzzK2nGKzL2plJLMLssBwq2z5hoyMcKP4LYHO1izODF+CnQOpVjdVLfIlD9g5qE0VQjfqZJvrdQP0BlO8M5cvgBajkD85pvhB/gwPNnp+Gry46LrrbtKPQvxs67MlRb5fmZ03DEbm4KBPMwk8E5B3uBoguaMKACoXIuxuoEpKZoJTUgeljxwHmRUkw9j3PzG2MG6k3JhvUM1d+IIPe4+uu15HC5VUKDZtjj9Y1U1D0ElUGE+2U0W87SM4GmcsSZ8pxbYuTE6eFiF8rAOdZzoiXUv6Rg5Mcg== 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=6KEQysnq0uTLidp7TfZYWY1ywhfEnBTczqE5/YTsVP4=; b=AAsuW4KS/+mpX3ZEhMQrLqNI39NjbmqeqgHwdR0ThNjJwKE8EaziHdarGa9meUaMznykmj0hj8uxFzXklgWOBMMHM9hNpKLXIZlYSkWNsUfU5FRNXMJIOzxvUR5pxbbiwasKbB6FFxvJ8khVv89VlbbSGpFi0ueff5eM73kMkYc/pkjE9/+tbpFyXG+Z6yzpt/Ht8gnzEtlVVAnTl3iZelVyVSvOcUnVR1+1cM3Vk2sbUlGvkexTS6GzuBoe+Mvuc9fzeWVSEHtI3S5zlR5UUDHo4f8qbFYp5dViCNAK1y7AaYjrcseujBwuSqlkezYReNO8PNVfZ8cblKDnvbXi3Q== 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=6KEQysnq0uTLidp7TfZYWY1ywhfEnBTczqE5/YTsVP4=; b=e2+neEcdFbwTRmqc1UKP0yjZQRtMiI1FZEUYjpE1RqiWE6VWBNauYJpuJ/MaM0fbzAtWGsvmCB2Hr6Tkg28OIMzbK1WRY0oKfqVhvL3snXpUudm3Wki5N+bj68MJWxsfIeHpGWhRzD8qg+Fbe/n6FTrOAxCFbksDInEOI3QzR8LSKfvfi8cbT8AamV8Khp5j2lTP8SGLRzMf4kLFP5XDtEqHbtmrGPbMNKCnqGRz4F2L611xxdOhl+rEeB1gDmoP0OZwrtf8wvoaYqrNmK6mBeQaL2HavSZAuBXk3RMiM26KQBlbgsHZ+s6xLRf3GLua5Iz/cpiU+weYQvf9t+/4rw== Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) by OSZP286MB2411.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:15e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Fri, 6 Jan 2023 15:18:14 +0000 Received: from TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605]) by TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM ([fe80::ff96:9cb6:e047:c605%4]) with mapi id 15.20.5944.019; Fri, 6 Jan 2023 15:18:14 +0000 From: Dawei Li To: johannes@sipsolutions.net, perex@perex.cz, tiwai@suse.com Subject: [PATCH v2] ALSA: aoa: make remove callback of soundbus driver void returned Date: Fri, 6 Jan 2023 23:17:46 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 X-TMN: [/SP0AfysDfQwD8rmeq/7D7EGIWsXSl6R] X-ClientProxiedBy: TYAPR01CA0042.jpnprd01.prod.outlook.com (2603:1096:404:28::30) To TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:152::9) X-Microsoft-Original-Message-ID: <20230106151746.27784-1-set_pte_at@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCP286MB2323:EE_|OSZP286MB2411:EE_ X-MS-Office365-Filtering-Correlation-Id: f897424b-2cad-4929-aaf2-08daeff93aba X-MS-Exchange-SLBlob-MailProps: ZLYX9kf+sFZMrcLbERgi90tWqdokkUc1N8Q4Xs7rtgSnpqYtH8DnePs41/cftVZeHDv0mz33bJQo2RVctKHSBozP6MqpW6odCiWhSaut0uTQS4tJK0MuPxKC3isHmubQ/W38hCv2x4WZHchspjYyVUrhtQ7KRM7uXH/O5UD17/qBIfUVH31iNgU4lY+ffDOiz8nm8aEtEmLGYsDpzjQhTw0bX5n/gnII+WoNoGMHrelt8Yvi/++xkWRURRII/7LkBLrNRb/vnlfkissQwihqdib41+Booe+LnuzS4QO5DlzrOVi+j7CoGjfBuovJFGXiee3vSz7yIIgFK0mgYFdDKIuz4o+3bg3v+KfopS4Gvrr/+YzJ5CHLiTGyroVcS4A9IHUwfmIdMfQGTk1xoqjkUuGy05in0mb39vKDWexQx6Y5pZt6I68G+NE+oFi8gihgL35chcG6yyl/GZGGOPJd6u43wV+qwCCAipfFqwlj5pp7GZTXpnO8xV1Sq+uMrCHt08cP9O5Gwt3YtSW12wnKajUMx2MoxM97/DU7D37z1N6Ve2QJbcNIvsWCnF1WXaFKBA1BcgK+jx0y9O7oM08HIYgcGiPItt1/10REkXnR3LT4crCI8/akb3C8ENgFNgQ8cQqqvs75lw9vNBvGk1iOuLpM88LVYuucHiUT0rUP2szOL2+DFjV9z/8g9ReO+C77B/Z7+bp8Qb6dUbSwN2ooYZYfTMaqQ9YddUJmV6nqwtu4dThJ0Mz1xqN2hBe1+RlHbfzh5c3uflVqdtGnSyRHo7vb+9UH1ljqYDuB5a7XQ/xD2jtJX4LBmA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lLKDfgVoM2S9K9fLWTImaqTcT17dKsrCJxZGUWgQxFVP4U0L4LSjFRb90XvjauwuodAEm7omKYk2/oj3P3SDjxo2kKEIMqbBEaMir9dly+LXpt6aWAefG32XOQGFUCWaxY5r6n2HaLWgJUz/HC7aHf9Am76Yf3WMTQ//h/VHLLZ9FCrZMMu9ZfMJCmxqUOElpAX0/3c5+ms5D6dl0aqBISWTJo35qpbH7aNOvC6yVXpJh8PtajR4HKuS+zr747Uwnpu7rZImLjAuTIdveZA6ylk96yHkkAd4DL11ll2PRdMIepSDE+zXpAPUPvXgMObYeB5hhpPwlKAJZnLmOE/g+137Xo6AuM+vdlcUekUGJ9FFcb9WC5/xBr2wAnUS28XcoozIknp0uYmbTjVHv4ZRnijFX8Bazi0Y6DYSX6Dr8QutUS34o7ybfdqjTtJRfdWWvE0lOYUY8tsYIvgvpesaJkQLFfr1eOVhZq860s96q04GBGLW+ryTWjLZSNS1+g4rCaR7pT6hPrqm+XzyShaTQVWYywAPQLeiET8fLxaCMUGaRON+Nr7z206QXXuk2RgDReFID3z0iu2JRJaoGctgC5L6V1r8CoZRJ3HoI1PpcKyLW9gE9YmjYUDScm343OdqUGlwsLkZsSN5ghuZWyIAWA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ++Ng21k5mfZL5oboe3p9qx43fhNNccH3U+p7hF9gDOqcTO++ItbbqVp+ubECrLYTlANSIvw10lrKjV6FnjppogNDwT6H2hAgDCWl7N8yj06dFiqyChJMgxdaDX2iBKJL0Y/F+1SdTeOFxhY7p0yXWbZeK44OflNh49D65zzuYV7m+rtA7/ovi87HVUhEbGpjyM2xb0Jsc6+dpIM8+Wdw26UyR4wy8JddaIGOGTiZw5HXRBcH/YmCKFq4s9tYG8bWETs/zzdQbr6qFQwb/9wRDg0rabWX4EKyEmnJJJ4j8L5nnW/+WwItKcVGTDYJH+x986GCJyrBjAzdVHir04ej9248Cpa8ooJqaxYpy6J8CoO7S3pLkqwMNMCpQJIVmvnLHXQQnJ190oig9ikrTytO59bA56VLqkzadintwPODPIFqWp0eMTlhrkokklX5QV4yzwEDEYiBCp91cF3uBlkys5r2ConN4+r7X3UbGCeY1EIQx6ZzApEhAiFSw1rAAVb4ML1C9rTNlCYUIDHc9KFAlqN2KuYGvx9mTYeE14faOxwFiSQP4k9a0Ej9Vw8gRcFD4A8TurRMd0K9lLVS35JyJZCLeK3fAOSgd5lHkvTsz3Cnnwsu8GEZKOd3n/WLIcWq9nEdK7V2aVD0q+vkMuRebC2D8NUADrT5vMEz1z6yt9XuKJperu9iC2s8xeYZFc9YTZl4vEP9LCyCji95DIt5ZfAN6PKW1GaSoXg2RYy7iw+8Lzu5ir1R/tPqor72L7cZvbLq6XXDv/9jmEZspMZ+gPjKIpJHDjZefkx4fBYZ9P9U5/eckEI/Kr2OZKykee9krboQP0tuj+UEckzUhc7MZFuWe7NHTuzirdzMa8MvWhxyncBNW1ijoc7tZXSH08lNOqDU/P8Pr5Zk250IbyDna+fcoW7xXYi/hkeze+sWxVuOG/2iq2TJSF3lN7KzbZruZJ35yHESyKm2+rFbpntR+hLMxjZzsHJfYMOM2d8GKOOnxNpzl45l3sCfJyIa/nuRCctMJYHBP9RuGofEz/c8IqIw6kHKoJfclK9ypfr3u4wTPwn1sSvUzG5OaboRCJWPSxDcfsvyEnpUU+o4ZwpYBveXQrJ2e5H5eGJo6m5SyEN2CiLHUFlMD2641NlNP328dXyzfUhrlcUteAjzZ0DbT1Bzb11Lf4dOvEX2FmtZ1hI+x8t/MDW4KQCbzoSmSuySQKLFc0xJJpbxNxH4Q65JWzN4WVRACmakxdweEqITikkCIZs9XWHi0DjFbWdkbeT9vQwuzu+aEAhGeTxJEjVz/g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f897424b-2cad-4929-aaf2-08daeff93aba X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2023 15:18:14.0221 (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: OSZP286MB2411 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 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: , Cc: alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Dawei Li 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. As such, change the remove function for soundbus based drivers to return void. Signed-off-by: Dawei Li --- v1 -> v2 - Update commit message. - Rebased to latest sound/for-next. v1 - https://lore.kernel.org/all/TYCP286MB2323BBFCE929111043E60D3BCA189@TYCP286MB2323.JPNP286.PROD.OUTLOOK.COM/ --- sound/aoa/fabrics/layout.c | 3 +-- sound/aoa/soundbus/soundbus.h | 2 +- 2 files changed, 2 insertions(+), 3 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..db40f9d042b4 100644 --- a/sound/aoa/soundbus/soundbus.h +++ b/sound/aoa/soundbus/soundbus.h @@ -185,7 +185,7 @@ struct soundbus_driver { /* we don't implement any matching at all */ int (*probe)(struct soundbus_dev* dev); - int (*remove)(struct soundbus_dev* dev); + void (*remove)(struct soundbus_dev *dev); int (*shutdown)(struct soundbus_dev* dev);