Message ID | 20230712093322.37322-1-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 c18csp1034822vqm; Wed, 12 Jul 2023 02:59:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnmaiwbDrzvqaIEQPawhkmRKb2QynyrqAwIxjQCudzs+WyxTTO2iYEiU2wkoPJyRDDoXqe X-Received: by 2002:a05:6808:1925:b0:3a3:ffbd:e2b1 with SMTP id bf37-20020a056808192500b003a3ffbde2b1mr11544627oib.49.1689155982463; Wed, 12 Jul 2023 02:59:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689155982; cv=pass; d=google.com; s=arc-20160816; b=o+NMjJMcmItcstYw2vB78TS0Hpu76y1JZyyQfgE21r4bS3gD9mY5I+cS+o7xXwYuP8 ZfOS+aJtl/3IWpzW7Bw/bqodKX8H2TlPr75+mY+ht6Z7vBbhJMJRHV9fK9Oc1UWMPR+o pNQr7OGA/Ejeil2wsw40o7D/10ueIvcuW+qkB2hM985kUBHV0tc7Yxd/T79DUwz+3Jty YN8BV3dsvtmETOJQXK3ykwIztbVlprFsIT/Hncg0AJwTCel7taBSBWyC3YyXFqarI61s tj4ALxC2n5JX1CjkD2ZGATV1Ve7VaMZAZ2rC7DFY3hihx6RmXbk2aNOnJS5fx5Eyq+Zt 8tVA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=mqJOSTWVYvvDD/0geGFqcr4P4Y4fddEKafaq1JUVAYk=; fh=1ZVFMYjAeZm9zk/YEtKTz04kdhpuhZdCtQy5mGxSXJ8=; b=wg9SdG4b54VL7GrKBDDy1hypIR99QEgAqHCMtunCM4542nSwQBTcTcVL0p7rasVffA xT6R8x4Jij04C/5joZHnaxXXPOIHpCUVzVhU6OhgMsx+XdvmCB4AKwBEARTrmcG3HaHN e7j45o2rw8gD+1TwCUx4stn1qtQAkkw1ohSJ3FtsFA1INVdGxejsjggwc7zpYKH/9l1A 7aYsWqjC3/1waVarn/Ruop8RLkNdPqJRN14VLRyx5V0SkMOsvcTYz3Km0b36oME+gRBF yuCJrUMy5Ll9ETYdbSXL+FPAI8asXB26aKXNVQiM2cfn7p8ymJiizEUy3raG/V7NZYJA 8Y3A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=aMRTZYaI; 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 cj23-20020a056a00299700b0067a5e89333esi3017069pfb.101.2023.07.12.02.59.28; Wed, 12 Jul 2023 02:59:42 -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=aMRTZYaI; 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 S233192AbjGLJdu (ORCPT <rfc822;gnulinuxfreebsd@gmail.com> + 99 others); Wed, 12 Jul 2023 05:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbjGLJdo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 12 Jul 2023 05:33:44 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2131.outbound.protection.outlook.com [40.107.117.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C46719B; Wed, 12 Jul 2023 02:33:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BZBCjqnEKkjqPGZu7mNI5v7kG0tFMaro+G01Dy+pWffww3d9p/ixIqb6paN3c0rxwXFv2+v137RHRZ4FGgwoWy72/yHnoyJ6KHf85sGCZVFWxWCG0qu3VYHMSBODkYWdoebmevKEeK+ig5d4xtH7MNIIV8xdEoSk0LPzUdHPI5kw8sGRAq8yzICIHwcDAaDbUqligXnMQQShE/0S4EW5nFAhNxLgJMGoBs8oLoVW0Ktp/fgelcpbx3oK4MH5UXh74E7yPyjyHoJ9bWaypvXZGTQLHYGgdL09GofrrwL6MwbFSFIVnAwUSal2YuYbGfZ/q38M+nQDRmb7qnOMd9szUg== 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=mqJOSTWVYvvDD/0geGFqcr4P4Y4fddEKafaq1JUVAYk=; b=JKIMn6MPz2aNxoEU5KSGFob5lqTjbZkXWw7I7FyMmi2ebBgB7ZjquUxuxSim7s+1P2raBMPB4pHqvztwwl7R7wRMRTOknbqE8OUyIpc7lkjxd6/8+iP/JDZQ8Zf1/Wii/VE09t9tkSt0AQqjZkfS3BAUALnSl38vC8Zh6TlsExqiuZQWOtxuP7coDR5ut/fE7l7zhnblS6HfI9zIxfvvPbLxXJroiKBhsNpVL5fgXwzaz30Z02tNvjkigkMg1fBsj4uVKCCLb4uKy8G53BGrZprPoLJQHfTkci4e4zSzMRPK+Ftk7PNb1wAH8eraB/h6rup7kXjOaoYsrjPWcCqc0w== 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=mqJOSTWVYvvDD/0geGFqcr4P4Y4fddEKafaq1JUVAYk=; b=aMRTZYaIX9MDOXsPxnC5Y8EkFmgPJaqi1TSLpzZ4zCBg2uJchEZtFchApL1qZK9JwKD3YFkpFj5CjwGXcvgBmF/2WQkqWfTwGFGq8vnstwkfkVXfxrvJ/GgbyG6I9QiXWbExQkk34n8X9RLCT/bAcVEh6bI/vF0AocvLAB6fiCNaa8nHnn5y9tHVkROrism8kImH+Wu+EfAccU16Xv9SQ7/NNtjEwSrCaAoghzmP1JIxfDDZ18gzM2Ucw7ZG8U+ljvu4Imj+bsViPlkfueK7lNV0tnSkGBRJ6i/JPJcgHOzbJScyM1tXRE5A215wrTtcjK8Tc8E6gN5V7uaEUgrLBA== 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 SEYPR06MB5985.apcprd06.prod.outlook.com (2603:1096:101:de::13) 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 09:33:35 +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 09:33:35 +0000 From: Yangtao Li <frank.li@vivo.com> To: Yangtao Li <tiny.windzz@gmail.com>, "Rafael J. Wysocki" <rafael@kernel.org>, Viresh Kumar <viresh.kumar@linaro.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: Yangtao Li <frank.li@vivo.com>, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/19] cpufreq: sun50i: Convert to platform remove callback returning void Date: Wed, 12 Jul 2023 17:33:04 +0800 Message-Id: <20230712093322.37322-1-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR01CA0172.apcprd01.prod.exchangelabs.com (2603:1096:4:28::28) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SEYPR06MB5985:EE_ X-MS-Office365-Filtering-Correlation-Id: abb97346-b692-43ff-67c5-08db82bb1036 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KlSF2NlGYaFhyBF7oPR/m5aBn3C2xck1RuvYPvauruVqSRp69wsaMXmcI8oSJiVD5YFBE5i8d6BPBqWxkU2zBvj/g6fzGcagsrMSsgOcMXkpEWIMjf972gJ/zJlS806HCAq2DneBaCAgu8oTP+Rk0qLhlYWGOWEnxvI1wD0aKRudS37oXnSz6fgI4+GY0o81k08FxU66LZEyKdlvuc4zi3z64/fWqeL1tZmT7gVtHgi+HoeEFw/uxygTMw3OV0gwkx7bMbM8/9gJqbYrXVN+mWPOXbQg/vkTW6RQnjfRytqrPj84L8BiGYKYStzttgnxrJ1vqVret+hHCCpkPQUZgIDK7uGiZAkPe3oloQOJ3kI9rfLBaFNCyfRxLovii5MLWQN2K9607HXo9tjooDyZPHGtC8W5h0sHIZDHR6YhjmVBhjeQKkw4ls7PApFCg+SPvDWWkKdNi3Q4wuu2sR2aR9+5hSHwVuUvLXwtsPs0WXhyoFP1NYtmJMNLb1TFUF8rDxpvbTPxWKhLobx6XGRtBMFzmFBtJAvb2+bGHZ+U8Cnzi7fBM/LNmckPSu/fKMNx18OcbsbXKE1lRgnC01GtT6g0cH1zcRtTvlM0eu5hHsPkImjWFADheu5V07hBUYlq 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)(346002)(366004)(376002)(39860400002)(136003)(451199021)(186003)(2616005)(110136005)(54906003)(38350700002)(38100700002)(5660300002)(8936002)(52116002)(6666004)(6486002)(86362001)(8676002)(478600001)(316002)(41300700001)(2906002)(4326008)(66476007)(66556008)(66946007)(7416002)(6506007)(83380400001)(26005)(1076003)(6512007)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ZAm2T3Lh07bkqMApXTMWLHkORoUS?= =?utf-8?q?cCVd20gjK5t5qa17pq4gg2EZ0ynELJnEsj+W2hfobfH6j12QNdqfktwmWY0jJJide?= =?utf-8?q?fxLzqNB2PC+OzZRtPIm+gkcEH73yYXmUka+Q8OWu6r5g18orZU68WjfcIEBjek+w9?= =?utf-8?q?PVrG0/WvxkdPAeQrGN2nmnjzd1at9ZScgihqBIBG6Vrg2/EeTFd/vlzKjbqKZSmm2?= =?utf-8?q?iFXrBzR7IlEMxQuW7GvxuHmqHMZy3yPdUAULEzH9RvWOSm4+uFGkHdIxYxVvVVPGh?= =?utf-8?q?dJ+EHrfeIkX3J36SiYQC0eNPgyTK9deCZbs1n5tQosx4j9xpt+BrYrfaETDvTVs4A?= =?utf-8?q?fGovvBNGEkuhZSljBq+5BtCZl90OATCknGrhZETCDuO6J4+uXE3o8no3jK3bhvl/F?= =?utf-8?q?tWK1o4U7sEdOvK3Zmws7w0ydAPKQmGLDPZi5ZrZymrds7aE4h6beXtSKp/oyQo/5/?= =?utf-8?q?JgQ6e3HPbQg3CJ9Zg3QcJNHhfx5ZJEf/kfS9XFqgjiQ6F8n4j384/DGi9E0cEG5jL?= =?utf-8?q?/2LeVJKPjtnRP+NN65NdKrU2hnkUFPcw6odoseqQqA5M/UBqcr6S53BuP6WLvBcoX?= =?utf-8?q?oQuJa0agepFiEISNbU4rXxAOoTZqlUX3F2HRZDJG2wtipfw1YmCJfSfYp2SSR2e8w?= =?utf-8?q?PCU4dCUfbag4m8FjWdNN6nxnokbe98/DVVyRhk5j3tfcs/N+Rh3rQTA6Od3EhOrJ6?= =?utf-8?q?GApgpCcrvrywnnsKB0S36+2VK6vm3Mk3cOW+CcL0lR2uxc5I81WgKMoT9cv9IMeqd?= =?utf-8?q?vrPLQ4xJ5kgF2y3vnM6rCXzwALk44Ih6wx836XqM9c5KfYjDZH+ysz31NZVsPyz/D?= =?utf-8?q?aLcquUR64tswMAhHyNrnhYNRq3aTbctUHL3MpQ/AaZq/eFvKiakeRxqZtz1kh7NwY?= =?utf-8?q?DFqSk4lDSsnuk9ZKQ1mcSmzMoBczE2uFPe5+msrE9poB7Sv/enGQWMXKjrDGNK4nC?= =?utf-8?q?fN1GEhi87h/IKn8wYGfPBsUhMazkUExe8qpUAenW+1Da8p/vgXMJmZY97nCNuV9AL?= =?utf-8?q?835/RqtEXX6At4SbnfK8hjTFbcrq5uTRoB1ydJ2x2Kq6Kvvycrvvpr8NjTmJ73sxg?= =?utf-8?q?/kZiidRNvwf87OutIwZY+Nv04oW2Qv9Bh7tJZ8O93fYn4Mtc5tEu6sMlB43W12UO8?= =?utf-8?q?PcFovYzBwLA7d2itn/wNk1/PJypYvKE43kRGRLAb/gjRhINd/E+kGHTPqnV41lPvv?= =?utf-8?q?J1koGheqaMJ4u3LN8Dlj/II24W6OKXCZUyRSgpkvczNPCyecK2zhJ9uk/yXZCZ/4F?= =?utf-8?q?SbQK/PW7Xtx39gUXMpJ1BWI6rdFGR+11HqyjmCuI8JUkG941TG/TqPLa0bJG8+tgX?= =?utf-8?q?TBxwAg6PKF0oUy7z531EV2PjQ3Fyq4XeSBbFTiThnbls5wr0iM5Ni9PfEeFwx49jp?= =?utf-8?q?1jS6CF8c965bC25TNg2TZg41m+RSsryF+W4vDEUDsYt54EV7uR1loLaUdwpv412O7?= =?utf-8?q?QN5MdKrKpW+UNjobImbjaqYkx2lhJ7Iksep5uHT6WgtmRsqKB2Ac/BirUUjPkwSvO?= =?utf-8?q?mA13jRXDYA72?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: abb97346-b692-43ff-67c5-08db82bb1036 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 09:33:34.7587 (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: jMB/XgQl3/6i4sNuDcRILeYY8dVIgeOlruUIx9vqBi8RToakzs5vjXlhCQMHOoTHkYyz/tyNntHbyxb/jdWf1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5985 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_BLOCKED, 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: 1771208423506506178 X-GMAIL-MSGID: 1771208423506506178 |
Series |
[01/19] cpufreq: sun50i: Convert to platform remove callback returning void
|
|
Commit Message
李扬韬
July 12, 2023, 9:33 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/cpufreq/sun50i-cpufreq-nvmem.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Comments
Dne sreda, 12. julij 2023 ob 11:33:04 CEST je Yangtao Li napisal(a): > 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> Acked-by: Jernej Škrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > drivers/cpufreq/sun50i-cpufreq-nvmem.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c > b/drivers/cpufreq/sun50i-cpufreq-nvmem.c index 4321d7bbe769..32a9c88f8ff6 > 100644 > --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c > +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c > @@ -137,7 +137,7 @@ static int sun50i_cpufreq_nvmem_probe(struct > platform_device *pdev) return ret; > } > > -static int sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) > +static void sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) > { > int *opp_tokens = platform_get_drvdata(pdev); > unsigned int cpu; > @@ -148,13 +148,11 @@ static int sun50i_cpufreq_nvmem_remove(struct > platform_device *pdev) dev_pm_opp_put_prop_name(opp_tokens[cpu]); > > kfree(opp_tokens); > - > - return 0; > } > > static struct platform_driver sun50i_cpufreq_driver = { > .probe = sun50i_cpufreq_nvmem_probe, > - .remove = sun50i_cpufreq_nvmem_remove, > + .remove_new = sun50i_cpufreq_nvmem_remove, > .driver = { > .name = "sun50i-cpufreq-nvmem", > },
On 12-07-23, 17:33, 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> > --- > drivers/cpufreq/sun50i-cpufreq-nvmem.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied all the patches. Thanks.
diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c index 4321d7bbe769..32a9c88f8ff6 100644 --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c @@ -137,7 +137,7 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) return ret; } -static int sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) +static void sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) { int *opp_tokens = platform_get_drvdata(pdev); unsigned int cpu; @@ -148,13 +148,11 @@ static int sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) dev_pm_opp_put_prop_name(opp_tokens[cpu]); kfree(opp_tokens); - - return 0; } static struct platform_driver sun50i_cpufreq_driver = { .probe = sun50i_cpufreq_nvmem_probe, - .remove = sun50i_cpufreq_nvmem_remove, + .remove_new = sun50i_cpufreq_nvmem_remove, .driver = { .name = "sun50i-cpufreq-nvmem", },