From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6A1BC4346E for ; Sun, 27 Sep 2020 09:27:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B01E62389F for ; Sun, 27 Sep 2020 09:27:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="HEZwHeJQ"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="PUOAdPzH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726656AbgI0J1n (ORCPT ); Sun, 27 Sep 2020 05:27:43 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:38152 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726497AbgI0J1Z (ORCPT ); Sun, 27 Sep 2020 05:27:25 -0400 Date: Sun, 27 Sep 2020 09:27:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1601198843; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wKR+mytJ+59GArKWsdLJziybCOsL4PfBl+o+11Jqdco=; b=HEZwHeJQid8klg9UHlyaK3Gh1tZRTeZRLdC3b+WqCh3sC3XFg4qVdsq4nyEYOMso8VzRq4 J4DbSnO6OR8ZCU3nKP5oSElVvjsF4cznuHo2gXbWqRlTOrrckt0jAhaToerQGxAVIyl/UN pEGU1RM2yZ+2NZj9QEo0KeO39sU6rKxpy+JwK1JAxYip5PL+eU+hDt374gTWTDxR0Rjz98 MnCAK6DHNT0xX7JjE1dEvLybbHIW9HHAaVo4wXuxe3cAgyvJp0cyCgpHZ9SzkuG5jz9Rxg vjACG8Kgt7cTG5rGH3cVqFsyoTqd1HchJcLUyT/70BR2XF1HY7JA8Fitxdw86g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1601198843; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wKR+mytJ+59GArKWsdLJziybCOsL4PfBl+o+11Jqdco=; b=PUOAdPzH7iCZxBj6SZTKJZ7ko0HITTB6QJUcd7FoXw2BE4EBbeQCbpPFmn9Tq5jAJqrOn6 o8nqM698r5edoHBA== From: "tip-bot2 for Kefeng Wang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] clocksource/drivers/sp804: Cleanup clk_get_sys() Cc: Kefeng Wang , Zhen Lei , Daniel Lezcano , x86 , LKML In-Reply-To: <20200918132237.3552-2-thunder.leizhen@huawei.com> References: <20200918132237.3552-2-thunder.leizhen@huawei.com> MIME-Version: 1.0 Message-ID: <160119884246.7002.9537010852462748057.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 7d19d521a034a8c58586814e0320463d1299a3a9 Gitweb: https://git.kernel.org/tip/7d19d521a034a8c58586814e0320463d1299a3a9 Author: Kefeng Wang AuthorDate: Fri, 18 Sep 2020 21:22:29 +08:00 Committer: Daniel Lezcano CommitterDate: Thu, 24 Sep 2020 10:51:04 +02:00 clocksource/drivers/sp804: Cleanup clk_get_sys() Move the clk_get_sys() part into sp804_get_clock_rate(), cleanup the same code. Signed-off-by: Kefeng Wang Signed-off-by: Zhen Lei Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20200918132237.3552-2-thunder.leizhen@huawei.com --- drivers/clocksource/timer-sp804.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 5cd0abf..bec2d37 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -22,11 +22,18 @@ #include "timer-sp.h" -static long __init sp804_get_clock_rate(struct clk *clk) +static long __init sp804_get_clock_rate(struct clk *clk, const char *name) { long rate; int err; + if (!clk) + clk = clk_get_sys("sp804", name); + if (IS_ERR(clk)) { + pr_err("sp804: %s clock not found: %ld\n", name, PTR_ERR(clk)); + return PTR_ERR(clk); + } + err = clk_prepare(clk); if (err) { pr_err("sp804: clock failed to prepare: %d\n", err); @@ -72,16 +79,7 @@ int __init __sp804_clocksource_and_sched_clock_init(void __iomem *base, { long rate; - if (!clk) { - clk = clk_get_sys("sp804", name); - if (IS_ERR(clk)) { - pr_err("sp804: clock not found: %d\n", - (int)PTR_ERR(clk)); - return PTR_ERR(clk); - } - } - - rate = sp804_get_clock_rate(clk); + rate = sp804_get_clock_rate(clk, name); if (rate < 0) return -EINVAL; @@ -173,15 +171,7 @@ int __init __sp804_clockevents_init(void __iomem *base, unsigned int irq, struct struct clock_event_device *evt = &sp804_clockevent; long rate; - if (!clk) - clk = clk_get_sys("sp804", name); - if (IS_ERR(clk)) { - pr_err("sp804: %s clock not found: %d\n", name, - (int)PTR_ERR(clk)); - return PTR_ERR(clk); - } - - rate = sp804_get_clock_rate(clk); + rate = sp804_get_clock_rate(clk, name); if (rate < 0) return -EINVAL;