From patchwork Wed Oct 19 08:31:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp226295wrs; Wed, 19 Oct 2022 02:45:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UwzpHkxV6HWD7zB8bbv91tGjXF8p1aVbAo2hPEqy2qhz1uU15b9JE/wQnk9ZU1ol1pUNB X-Received: by 2002:a17:90b:1d4d:b0:20a:794a:f6e7 with SMTP id ok13-20020a17090b1d4d00b0020a794af6e7mr44800370pjb.151.1666172729444; Wed, 19 Oct 2022 02:45:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172729; cv=none; d=google.com; s=arc-20160816; b=PPmPhVw4OO5JWNgtC4QQUyEiHkpos944hKdrPSs9wR0Xzq1dw9g36tr3c6M5NFGrZn 9xsgM67dUAWrrTZNPT4kKqiQeCky8aam9aIJjZi+NKNn25ta0JmlcGTxbG58im3UDUev lU3m8JkSrSx9AffHu5hjQWwCkzGqozdEWQGnxAXfckF2mLOueASeP/9wv7cq/d/EZELf iIU62Lrn+DOCWLii+w6jUjxNozpB7SAxPLLxNTtJZnKt+eicWd+wHcVaZHwfYI5CCHlv K/tpOvPZ0buQ5iWfjbf/TVtARILhLyrYuFRA9J30ijuCYGf/GeQfGp1ZnnicIGepFXla XAgg== 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=pNTr0KNQnd5Vvb/hKYLjq9eYwlofTklQQIuTZT31wxk=; b=VuURlh6Lo14bow44iwfI1stRJSTiCguN/05UT8EvnK8TYFEATCKGhK/Ky/cP9xUSUF aCtr4uRHcFaP4ypdk6UpsnFhXapTKD7Cf1c1bqjlEOIXOusBMJ9juCL6CcGbKGoOjGCo XNyrYcqij8EC5d392P7pdv93kt+YbE+ikJy0ypscNzyUGQdWEOuj3Afsch6O5DkBvoEr v7KbLljxCr2o8Pyr19idC9Oi5DaripwwKE9oUrW9a0kcNtwY7EQ/a7epvrAuLDFQAJDF 2U8TH7cjVaW+XhE1BjX7MuRscODTNI+okG5dukn/zzKESQLWNdTc4SL877KyyC4DiJsI WUQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hIxPga6l; 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 l5-20020a63da45000000b00462ee755db7si18497598pgj.156.2022.10.19.02.45.10; Wed, 19 Oct 2022 02:45:29 -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=hIxPga6l; 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 S231416AbiJSJmd (ORCPT + 99 others); Wed, 19 Oct 2022 05:42:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231474AbiJSJhD (ORCPT ); Wed, 19 Oct 2022 05:37:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9CC33CBED; Wed, 19 Oct 2022 02:15:40 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 30E1F617E8; Wed, 19 Oct 2022 09:04:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47D65C433C1; Wed, 19 Oct 2022 09:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170251; bh=1wghsjgKKn7NZz43uELGlj/gxRjZkbBQYsZJUpGB+wY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hIxPga6lQQp1q5iZNxztv0hLMsF+xIlgqsfeC5o7X38F+kuCoW45TmTABmD6DN149 F+/iZoJJe2m3swl3uRzZjnmWAPxHYlH5wAOCrzhb5oAgWRoJNj+TYm6osV49xTo4+Z nflOn4rLxajupD2NQww9n90YaM72a1fiTkkOM5oQ= 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 6.0 584/862] clk: mediatek: Migrate remaining clk_unregister_*() to clk_hw_unregister_*() Date: Wed, 19 Oct 2022 10:31:11 +0200 Message-Id: <20221019083315.771298596@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747108736153627398?= X-GMAIL-MSGID: =?utf-8?q?1747108736153627398?= 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 9b82956260d3..e1b445f2c5c5 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); } }