util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hwclock: fix indentation
       [not found] <CGME20210316115327eucas1p1735dd1ce566ef851bad9560927198834@eucas1p1.samsung.com>
@ 2021-03-16 11:53 ` Łukasz Stelmach
  2021-03-16 13:24   ` Karel Zak
  0 siblings, 1 reply; 2+ messages in thread
From: Łukasz Stelmach @ 2021-03-16 11:53 UTC (permalink / raw)
  To: util-linux
  Cc: Bartłomiej Żolnierkiewicz, Marek Szyprowski,
	Łukasz Stelmach

Fixes: 042f62dfc ("[clang-tidy] do not use else after return")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 sys-utils/hwclock-rtc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c
index 163f04e7a..7f1f0b663 100644
--- a/sys-utils/hwclock-rtc.c
+++ b/sys-utils/hwclock-rtc.c
@@ -294,12 +294,12 @@ static int synchronize_to_clock_tick_rtc(const struct hwclock_control *ctl)
 		if (rc == -1)
 			warn(_("ioctl() to %s to turn off update interrupts failed"),
 			     rtc_dev_name);
-		} else if (errno == ENOTTY || errno == EINVAL) {
-			/* rtc ioctl interrupts are unimplemented */
-			ret = busywait_for_rtc_clock_tick(ctl, rtc_fd);
-		} else
-			warn(_("ioctl(%d, RTC_UIE_ON, 0) to %s failed"),
-			     rtc_fd, rtc_dev_name);
+	} else if (errno == ENOTTY || errno == EINVAL) {
+		/* rtc ioctl interrupts are unimplemented */
+		ret = busywait_for_rtc_clock_tick(ctl, rtc_fd);
+	} else
+		warn(_("ioctl(%d, RTC_UIE_ON, 0) to %s failed"),
+		     rtc_fd, rtc_dev_name);
 	return ret;
 }
 
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] hwclock: fix indentation
  2021-03-16 11:53 ` [PATCH] hwclock: fix indentation Łukasz Stelmach
@ 2021-03-16 13:24   ` Karel Zak
  0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2021-03-16 13:24 UTC (permalink / raw)
  To: Łukasz Stelmach
  Cc: util-linux, Bartłomiej Żolnierkiewicz, Marek Szyprowski

On Tue, Mar 16, 2021 at 12:53:13PM +0100, Łukasz Stelmach wrote:
>  sys-utils/hwclock-rtc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-16 13:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20210316115327eucas1p1735dd1ce566ef851bad9560927198834@eucas1p1.samsung.com>
2021-03-16 11:53 ` [PATCH] hwclock: fix indentation Łukasz Stelmach
2021-03-16 13:24   ` Karel Zak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).