[04/27] drivers/thermal/rcar_gen3_thermal: Convert to platform remove callback returning void
Message ID | 20230712081258.29254-4-frank.li@vivo.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp994779vqm; Wed, 12 Jul 2023 01:25:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlEnSV3I4i5ATzJr51MynvUPg0n+b6Zn9ZELEtFIdBMvSYxus3Ov420JG4V/ZkVlUcVN4DVc X-Received: by 2002:a17:906:8413:b0:988:4a48:6ff3 with SMTP id n19-20020a170906841300b009884a486ff3mr14350586ejx.30.1689150333048; Wed, 12 Jul 2023 01:25:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689150333; cv=pass; d=google.com; s=arc-20160816; b=OWVIQSZW2tOOgXhaNDWIb4e0gUbmQANMavi6JTmiULJ+HzlcW0+7yKPMPAXIQUR7a9 fN2hkwcbVAkiZfdo8xeCea1bxenbuvvyzA/palTBCxYKDs12IWcy3k7WItpRQIGzTChB 0QEo40J3UGkuoRA3onLXeU8oyuZwpEG/NlAlT86j5rwMLSGaAPYLiWAVcw0yogzUDuQm U0w+AnRaBuS4msKhN4EE0EWM4vobzS4tVLco1TLLf+qN/QV95rlojjI/AeFhz0TI7YGe nV7l5gyrJ5UMO/Wdh7XL2HQcrGHMtSKvvgfGJHOIo/DQK+uM7N56j48fJeUisOhtSyNe Sbzg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vyvljtpagtsfnuAKvlq6VdiLKjkkJMSxKhFNYW+BGnI=; fh=Cmjlp7r1sVwzkDkoKftLyginZOx26MWtlgTL6TCUiUI=; b=g/F/i9b6g+5NF0Ak8v7iHpr97NKn/X3JhHCcGqKze2rft4+9wCcZmHQK14CnGQ/DN2 eTSJma9RzhYKfYk42b5MTpLutT881kyQycTiFsOKzhnixH44I1B1Ze2VopdIuZg61fa8 h56uNX8MdA5Bxf5tQsMO2AWF6wRPtI+pWBs6+ma+LoH5qgJ/1pu2L0KDBvFuePOdfmvq qbjkjgtj30Scw2gsJ72ArLGcMJ+MxMzXSF7AXYyWNrnEF3g9B/B2nAv3eo98XbIiec7I /au3j6/VAE3Ro/S//RumnbB0Uc3FAaOnoo2dsFQ/VTpJgdJbkF+G0O/hH7M/qWgqhiOD Qcug== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=OB7Y4qa5; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a1709067c4900b0098d373fa9d9si3885373ejp.149.2023.07.12.01.25.09; Wed, 12 Jul 2023 01:25:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=OB7Y4qa5; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232180AbjGLIOQ (ORCPT <rfc822;gnulinuxfreebsd@gmail.com> + 99 others); Wed, 12 Jul 2023 04:14:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbjGLIN4 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 12 Jul 2023 04:13:56 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2107.outbound.protection.outlook.com [40.107.117.107]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A7CE195; Wed, 12 Jul 2023 01:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zbx+RKPfOcVBknTlxqNsE7/vQ2KIuwsPNxAoiGy0uYfAkUQydN+EFz4Fpkt3YcAu0ojxs/QRvyhpLJCv2TUJGWFQ85P+ntKFhrK+3ZrC+IJQ5+rAnkLpiY+b17ecx4SxdUU4YQKkWH/UBSmyPM5D0uonMhFCgGjqh3nl4M5alNMtViCrRVre+ABnbFREl/EtT7T7kv8VaHSBHTNIJSyIn0mb966Kk7F6pF5A/Q0kKF4pL2MYpjhqGb7umfDjsQI51n/o4s8K5ZmRWt4C/JKWazVpup239pHo6gGGfHfcsKvYxkismUcLTNv1qfeAyTFtlUxN6E0pjUnIWQiDHlpivw== 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=vyvljtpagtsfnuAKvlq6VdiLKjkkJMSxKhFNYW+BGnI=; b=kOEUxDiW/1pIIM3Ymd+loW5UDcb8/n0/m2l/odYxPt2qAnsjULdr/J9/DdSilReAyOY/66RUT87T7T/jANONlrrNqPdWUlKTPUOjT80obtmnVfvS9qfYIn0t8oSZmNDJnQljQ4YVlX0IBf6AOrI1ynFZu2FEDoM30Ic2bRlmnMD3ps+UpzXqzzqKfOOK0Uuxean/uUKuaMe32av3DOAYK0VfW7iarlD5no7/hGsP4aaylDITfFZCLfkXjiMxe37C/NI89mWNcCXjHJRWqsO2IHon8Q/YpbvGnF8b2LX29tmBW9n61gsbkt9vjSz5NOWnHxVBQfQEtiYrXgLKTVNRpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vyvljtpagtsfnuAKvlq6VdiLKjkkJMSxKhFNYW+BGnI=; b=OB7Y4qa5Sr1zcDPOwH8317SUQWQzDaH7ITzlXJISf2AiZNOAxHXPxI97qj53WxkLUgJ/ykkR/vt+khHRgG7qE47au7rQtWpzvgIXJQ5cSLpECN/ddK13L4ZADcoe7IpaFNy33puZFgCre5WMYQpkMDmq0JyquMdKUUVvfowCS2yfp7uVTX1rVWPlBM6HUmKicqMYjlGtcM6jjkzJF/I7uFgehr2eQfwaVvL5qb0syWJvsEcyLc+ov/Vmbw91SAEERijoHNxUZtCMmlRcEMtrVlUIR8RBe0w6xUXGQgI2zpds0hJxj3WGD31SzffscDejqdMFJKOMoKVA0+fTVsGPDg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SG2PR06MB5382.apcprd06.prod.outlook.com (2603:1096:4:1d5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.20; Wed, 12 Jul 2023 08:13:52 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c%5]) with mapi id 15.20.6565.028; Wed, 12 Jul 2023 08:13:52 +0000 From: Yangtao Li <frank.li@vivo.com> To: =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>, "Rafael J. Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com> Cc: Yangtao Li <frank.li@vivo.com>, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>, linux-renesas-soc@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/27] drivers/thermal/rcar_gen3_thermal: Convert to platform remove callback returning void Date: Wed, 12 Jul 2023 16:12:35 +0800 Message-Id: <20230712081258.29254-4-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230712081258.29254-1-frank.li@vivo.com> References: <20230712081258.29254-1-frank.li@vivo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR04CA0208.apcprd04.prod.outlook.com (2603:1096:4:187::10) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SG2PR06MB5382:EE_ X-MS-Office365-Filtering-Correlation-Id: a372113a-ca4a-40d0-d086-08db82afedd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MJ51T+ZoCoXSZN8t/Q3cEF1xlqMyUoFtOWLYfNOePi+nP4r2pSuTDdmx2CZT2pNRZkBG61p5xQCpFQ+MpM97p1IzA6HHp8b6nqIl1p9H8T9eW5l3c7399uXfYo16TQGmPgod9dELFFYlCvBtQwXPu8cV/hTi6+5bH8GXkqur6nStbEDWYqT/FNQ/crrnHkpSXH1DlkYnNeOKwsPEe7f0JEqfRWd7o2XEqNR52QovBKeHAOp4gJ8cSm2UiL1LUEnNw/wB+6kgg8ZjybDBi1bHYPOuDW0Dh6r2d6jZTGFhCgaNIyZGU3AFRWxih89LjkjOzOibctMY884J/bP+DtQZwAoSEj8AVVqeweqa8YRTQTtS9n7B1nSAYE+nSwEeisPbE2Bo9ivDQf9pOjxdd9ESIzHgzZq8kp0+wWNu29s/Wb+Id5G7ZIYgSZnMtJcrEq810DviR44RCdgT6FTEFPzQPo9uWz0WrRoki0tT2F9PnPCyrAVKfYiW6nizNOrg/OAruAGHpJESKMuSJVSn88a437euoXXd6IeHxP3WBnSCkqK9j+TcPIHMHI16qozGAUEISq60u7/3MX1OKo+YJhTie4G4nMdIK5gn1U8MdnpYidgvq3UMttNQ0t96tUit2Yqp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(366004)(136003)(376002)(346002)(39860400002)(451199021)(6666004)(52116002)(6486002)(478600001)(54906003)(110136005)(6506007)(1076003)(26005)(186003)(6512007)(2906002)(66946007)(41300700001)(66476007)(316002)(8936002)(66556008)(4326008)(5660300002)(38100700002)(38350700002)(8676002)(86362001)(36756003)(2616005)(83380400001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oDfpH2nIgh4c6zHsRuHcUplEcirs?= =?utf-8?q?VZxsnKOUgc2uS7vcdyKnzA8zSf5zBZj+YGC9ghaCLOdZChYD122uTgnjopkP9FSf5?= =?utf-8?q?PsKif3uM3zHzrCj/Z3MMDetzcNtO08EHcEqdrhy2YlQ9UsMrmLZvxuL8XH+gHbmGc?= =?utf-8?q?wme9jMEB7gl+gw3FtwmE35k8amxMjYi6eFtfHxE3exPOIzxQtqW6E2ABNRIK2RBqI?= =?utf-8?q?5pXhbDNKjOr0olvgqw3xMu1scesX4gstAjmuD1qzsA/2h7lay+/Z5gD9K4uRCLfBd?= =?utf-8?q?HPwdmqsKdEoZXY1vdhHLy1K55Sl+tnyD2ShN/wExGSoZ67smyyIsZdk8cppTzR6+J?= =?utf-8?q?lb2TrNUS+h8P1bbXOzT9upCXK27xR0qlIj44rT423SmRnrG01boQ+8aHXO356/Fyj?= =?utf-8?q?jLxFImB7nwXSnJHVNjHsjm+bFNWQlCNIybRSvvWsTuCc+HxUUkfW4v3+ZETraeoh8?= =?utf-8?q?daXp9BqvWyu9Vf20Cf9fv0Lgb7gDwPZLm35XPk3kFFcJXB6rh+zWB1bMt3qzInD2W?= =?utf-8?q?doAUk/A2f10cM2lWa56jX6vyL6Wd0rhL4K2stP7zuFUgvPWD1D9NmuTtxA+9KW3wI?= =?utf-8?q?ke4FwrD+3vR3QOcl5k/D4XAcGrabBg3bjyJPidEwfB+ZuU+44CnlJ9H8qaDGJrMp/?= =?utf-8?q?DPJ+zA0rej505op2P1xemS/NBVaRaFoSxrztAbpplz4Tp1PxGT+UqaRQ/g9NlSYwU?= =?utf-8?q?MZ5qqHF4kWyawKlh35kDaqRDb0FggE4UjzEmS/xXd99GOKsudKqVE9huxMRQdfgBR?= =?utf-8?q?3ajbKd2m1uK6+Od2L7Rb0eoAazZjTS4pB2rARtjVf3p7zKr2ibsJzzuxf3WTPplj0?= =?utf-8?q?QYH9baaTx1KpcWoTa6MdnfnpLPR8gGMrJZiWul6gQvfeEh+hGs1DAncw4c9sTft3I?= =?utf-8?q?egrGA3nju5kef323uQJ2lxOf4OJsJDASbkqo8RAe7yZjhrtEAP8GClS7tdiypfdkS?= =?utf-8?q?soXvhsfiGYUYwIuiTeeSCh3a2B+7Qs33JWoNcFGlWxE6vogDnNxBro+1PDkjgE3mI?= =?utf-8?q?rK77KJLETikokLx9GUd0BmSJL4b8VfG5OwI+oUYVsIrKYKpNZkwXDf8B9fiv0APsT?= =?utf-8?q?FVn5bP1Y2uYmWOSYISAUabKUEx7OYIPXBc1dr0mwDs9ZLFZf4WtMO+Dec/N8bAzZ1?= =?utf-8?q?8R62toIpCaqWjLJziBv/IkRg8i6O/7s+K7oox2T/QVT2iNerQ5itC3ZyB/TJ1DOzq?= =?utf-8?q?/4J1T0zeSVJ9QhWNNGlm4t5j0rFFjwYbXXUUePqCTP1VHe4Enk/QOSl6m+/VlOELU?= =?utf-8?q?NCL3+pLKcDqremTYrHW3Frahxdbf+JGTt8NVFd0QMr5PUjMmwqMZ0pvzfeshIsACt?= =?utf-8?q?72DkQTLCGC4LOFHesgky8uKxwnTfZTvgax2X2wtl6LGzwUeRVEQ2P4M2CaTHzaYXx?= =?utf-8?q?0GiuxmxyRKnAikLBgP0m5slnakd1U+NnsOWAzbJf9qLXz9C7XxmU/l8D36xpndiRs?= =?utf-8?q?8UHtCXG3eNl3BKe9kggndhwc0w6Ir/sl6AcTiO/EnII+aQ31gK9VIS7KdoaMc70Py?= =?utf-8?q?yEtjFbZgXOGZ?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a372113a-ca4a-40d0-d086-08db82afedd2 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 08:13:52.5430 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ozMT979mJAxXw4mN/lcAxFUPK1BTmyuG8PrTjv44MOtjRez22EuifPW+GMX4paKgf+N0btBdDLnQS7hyaaHyLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5382 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771202500032976431 X-GMAIL-MSGID: 1771202500032976431 |
Series |
[01/27] thermal/drivers/amlogic: Convert to platform remove callback returning void
|
|
Commit Message
李扬韬
July 12, 2023, 8:12 a.m. UTC
The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is (mostly) ignored
and this typically results in resource leaks. To improve here there is a
quest to make the remove callback return void. In the first step of this
quest all drivers are converted to .remove_new() which already returns
void.
Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/thermal/rcar_gen3_thermal.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Comments
On Wed, Jul 12, 2023 at 04:12:35PM +0800, Yangtao Li wrote: > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is (mostly) ignored > and this typically results in resource leaks. To improve here there is a > quest to make the remove callback return void. In the first step of this > quest all drivers are converted to .remove_new() which already returns > void. > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
On Wed, Jul 12, 2023 at 10:16 AM Yangtao Li <frank.li@vivo.com> wrote: > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is (mostly) ignored > and this typically results in resource leaks. To improve here there is a > quest to make the remove callback return void. In the first step of this > quest all drivers are converted to .remove_new() which already returns > void. > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
On 2023-07-12 16:12:35 +0800, Yangtao Li wrote: > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is (mostly) ignored > and this typically results in resource leaks. To improve here there is a > quest to make the remove callback return void. In the first step of this > quest all drivers are converted to .remove_new() which already returns > void. > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > drivers/thermal/rcar_gen3_thermal.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c > index 9029d01e029b..1405163caa34 100644 > --- a/drivers/thermal/rcar_gen3_thermal.c > +++ b/drivers/thermal/rcar_gen3_thermal.c > @@ -432,14 +432,12 @@ static const struct of_device_id rcar_gen3_thermal_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids); > > -static int rcar_gen3_thermal_remove(struct platform_device *pdev) > +static void rcar_gen3_thermal_remove(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > > pm_runtime_put(dev); > pm_runtime_disable(dev); > - > - return 0; > } > > static void rcar_gen3_hwmon_action(void *data) > @@ -594,7 +592,7 @@ static struct platform_driver rcar_gen3_thermal_driver = { > .of_match_table = rcar_gen3_thermal_dt_ids, > }, > .probe = rcar_gen3_thermal_probe, > - .remove = rcar_gen3_thermal_remove, > + .remove_new = rcar_gen3_thermal_remove, > }; > module_platform_driver(rcar_gen3_thermal_driver); > > -- > 2.39.0 >
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index 9029d01e029b..1405163caa34 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -432,14 +432,12 @@ static const struct of_device_id rcar_gen3_thermal_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids); -static int rcar_gen3_thermal_remove(struct platform_device *pdev) +static void rcar_gen3_thermal_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; pm_runtime_put(dev); pm_runtime_disable(dev); - - return 0; } static void rcar_gen3_hwmon_action(void *data) @@ -594,7 +592,7 @@ static struct platform_driver rcar_gen3_thermal_driver = { .of_match_table = rcar_gen3_thermal_dt_ids, }, .probe = rcar_gen3_thermal_probe, - .remove = rcar_gen3_thermal_remove, + .remove_new = rcar_gen3_thermal_remove, }; module_platform_driver(rcar_gen3_thermal_driver);