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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 1A924C43331 for ; Mon, 23 Mar 2020 21:30:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E32D720719 for ; Mon, 23 Mar 2020 21:30:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726203AbgCWVas (ORCPT ); Mon, 23 Mar 2020 17:30:48 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:39541 "EHLO relay10.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726955AbgCWVas (ORCPT ); Mon, 23 Mar 2020 17:30:48 -0400 Received: from localhost (lfbn-lyo-1-9-35.w86-202.abo.wanadoo.fr [86.202.105.35]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 596A5240006; Mon, 23 Mar 2020 21:30:46 +0000 (UTC) From: Alexandre Belloni To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rtc: class: avoid unnecessary lookup in hctosys Date: Mon, 23 Mar 2020 22:30:39 +0100 Message-Id: <20200323213039.297458-1-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org rtc_hctosys is only called when the relevant RTC is found, avoid looking it up while we already have a pinter to the proper struct rtc_device. Signed-off-by: Alexandre Belloni --- drivers/rtc/class.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 8793b2b8cf9d..03d6516941a8 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -46,20 +46,13 @@ int rtc_hctosys_ret = -ENODEV; * the best guess is to add 0.5s. */ -static int rtc_hctosys(void) +static void rtc_hctosys(struct rtc_device *rtc) { int err = -ENODEV; struct rtc_time tm; struct timespec64 tv64 = { .tv_nsec = NSEC_PER_SEC >> 1, }; - struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE); - - if (!rtc) { - pr_info("unable to open rtc device (%s)\n", - CONFIG_RTC_HCTOSYS_DEVICE); - goto err_open; - } err = rtc_read_time(rtc, &tm); if (err) { @@ -83,12 +76,7 @@ static int rtc_hctosys(void) &tm, (long long)tv64.tv_sec); err_read: - rtc_class_close(rtc); - -err_open: rtc_hctosys_ret = err; - - return err; } #endif @@ -433,7 +421,7 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc) #ifdef CONFIG_RTC_HCTOSYS_DEVICE if (!strcmp(dev_name(&rtc->dev), CONFIG_RTC_HCTOSYS_DEVICE)) - rtc_hctosys(); + rtc_hctosys(rtc); #endif return 0; -- 2.25.1