From patchwork Sat Oct 22 07:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1104951wrr; Sat, 22 Oct 2022 01:33:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gbVVHt1fV4A23X1KR+VXvwgHAPGWb7bJLoHbN56btZ1exd2SSJ0NQEpDk7rdpE3QDN7nA X-Received: by 2002:a17:90b:4c92:b0:20b:a13:83c7 with SMTP id my18-20020a17090b4c9200b0020b0a1383c7mr62465857pjb.128.1666427615810; Sat, 22 Oct 2022 01:33:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666427615; cv=none; d=google.com; s=arc-20160816; b=IEjm+Y8j96FdSzVu4vxoo1EL44mkCceae2Sn+x2NELc7TsIb1Wd84vuqNqUWNs///W F5zXo9mmUkMI9zu2d2b2nOi90NQDVT4/HkWzFZ12AKqmq+Cta4SR0uAWg//Jto4FTGtH JtU+XJGmkt+Nx1ie+UGz0IpYrDpUqR3LuxuZ5BHrZk7IctYGgjOWH6TsGwHtl2/49t4d Dhp4BALemvlou/6VyM/ExWEsft1e3JNRtCbD8Q4aIDL8vvzqD7vuiDLsOCZUVm4KmeYX 1d53ODkEnNM0CI5Uz+IH9xwe/M1HqIIeaCEwuRPvdoBj7vWLLxumdDcOd9ZNNFf1/q1W e8uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ImLMwpaAIsEriiX3RobgXe3W3OMtyzo7z7LTVGWoP00=; b=BSV6YJ+5oWRyFr/VOpdqYwggZn79+c+XKm5EKboeCnKwwu2qMFPOS62J8Jo2LK3Tl9 pHPUQ1zmJUkVw86H3hp/53DAvhP1iKrZuSC77XsWBDdGclgAvkJGcse0ru00AxyPD13Z i91wMUla9sH3xPhi8MvF21ViQeNiryJ2Ja+g7vR6rxt0VU4TTcjyqx3sdXa/glxtNCPt OsTdZVbRYGQS0rYoGcb3etJiT/i6NfvojH1ILWQgFM2+T0APkFgLbvdwbFwyoiDKHzwo oyp7SOsfwfhIft35WFTlyjJGGVPiYerKF3BZdSLeYzLEpYKp7PHZj0H1E4xposmTbT74 niUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I0rVqZXF; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a187-20020a6390c4000000b0046b172c5c54si27026507pge.561.2022.10.22.01.33.22; Sat, 22 Oct 2022 01:33:35 -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=@linuxfoundation.org header.s=korg header.b=I0rVqZXF; 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=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233434AbiJVIQ6 (ORCPT + 99 others); Sat, 22 Oct 2022 04:16:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233765AbiJVIPE (ORCPT ); Sat, 22 Oct 2022 04:15:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 911F2112A93; Sat, 22 Oct 2022 00:56:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0CC3EB82DF2; Sat, 22 Oct 2022 07:56:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5187EC433C1; Sat, 22 Oct 2022 07:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425362; bh=srv/EIl8izX/BPUoVv3mGmNEBkCdcC6kZNz8wlmMOUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I0rVqZXFH8MimDFqY3LYb/xwraQ6RuWIE6mGMRo2n47KwozVTuPPjPADWFijxKBJI jIQfqP7GPjYTnzDWKEnHgWBfblALY1n9+aJ1zClFaZO29VA0ydQhQRTMsjW1l21ng2 rqJgn6l5Do43TBoU/Dym4wCr8rPuRcPTEkwwMnFI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, AngeloGioacchino Del Regno , Chen-Yu Tsai , Sasha Levin Subject: [PATCH 5.19 476/717] clk: mediatek: Migrate remaining clk_unregister_*() to clk_hw_unregister_*() Date: Sat, 22 Oct 2022 09:25:55 +0200 Message-Id: <20221022072519.406403441@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747376003889132179?= X-GMAIL-MSGID: =?utf-8?q?1747376003889132179?= From: Chen-Yu Tsai [ Upstream commit fef14676fc4be40b8441745a3c96b7e7d7d8592d ] During the previous |struct clk| to |struct clk_hw| clk provider API migration in commit 6f691a586296 ("clk: mediatek: Switch to clk_hw provider APIs"), a few clk_unregister_*() calls were missed. Migrate the remaining ones to the |struct clk_hw| provider API, i.e. change clk_unregister_*() to clk_hw_unregister_*(). Fixes: 6f691a586296 ("clk: mediatek: Switch to clk_hw provider APIs") Reviewed-by: AngeloGioacchino Del Regno Link: https://lore.kernel.org/r/20220926102523.2367530-3-wenst@chromium.org Signed-off-by: Chen-Yu Tsai Signed-off-by: Sasha Levin --- drivers/clk/mediatek/clk-mtk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 53bb8b88332f..35845163edae 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -80,7 +80,7 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num, if (IS_ERR_OR_NULL(clk_data->hws[rc->id])) continue; - clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk); + clk_hw_unregister_fixed_rate(clk_data->hws[rc->id]); clk_data->hws[rc->id] = ERR_PTR(-ENOENT); } @@ -102,7 +102,7 @@ void mtk_clk_unregister_fixed_clks(const struct mtk_fixed_clk *clks, int num, if (IS_ERR_OR_NULL(clk_data->hws[rc->id])) continue; - clk_unregister_fixed_rate(clk_data->hws[rc->id]->clk); + clk_hw_unregister_fixed_rate(clk_data->hws[rc->id]); clk_data->hws[rc->id] = ERR_PTR(-ENOENT); } } @@ -146,7 +146,7 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num, if (IS_ERR_OR_NULL(clk_data->hws[ff->id])) continue; - clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk); + clk_hw_unregister_fixed_factor(clk_data->hws[ff->id]); clk_data->hws[ff->id] = ERR_PTR(-ENOENT); } @@ -168,7 +168,7 @@ void mtk_clk_unregister_factors(const struct mtk_fixed_factor *clks, int num, if (IS_ERR_OR_NULL(clk_data->hws[ff->id])) continue; - clk_unregister_fixed_factor(clk_data->hws[ff->id]->clk); + clk_hw_unregister_fixed_factor(clk_data->hws[ff->id]); clk_data->hws[ff->id] = ERR_PTR(-ENOENT); } } @@ -414,7 +414,7 @@ void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num, if (IS_ERR_OR_NULL(clk_data->hws[mcd->id])) continue; - clk_unregister_divider(clk_data->hws[mcd->id]->clk); + clk_hw_unregister_divider(clk_data->hws[mcd->id]); clk_data->hws[mcd->id] = ERR_PTR(-ENOENT); } }