xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: mc146818: Reduce spinlock section in mc146818_set_time()

Browse Source 
[ Upstream commit dcf257e92622ba0e25fdc4b6699683e7ae67e2a1 ]

No need to hold the lock and disable interrupts for doing math.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201206220541.709243630@linutronix.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Thomas Gleixner
2020-12-06 22:46:15 +01:00
committed by Greg Kroah-Hartman
parent 17293d630f
commit db44a9443e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-mc146818-lib.c
View File

@@ -249,7 +249,6 @@ int mc146818_set_time(struct rtc_time *time)
if (yrs > 255) /* They are unsigned */ if (yrs > 255) /* They are unsigned */
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&rtc_lock, flags);
#ifdef CONFIG_MACH_DECSTATION #ifdef CONFIG_MACH_DECSTATION
real_yrs = yrs; real_yrs = yrs;
leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) || leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
@@ -278,10 +277,8 @@ int mc146818_set_time(struct rtc_time *time)
/* These limits and adjustments are independent of /* These limits and adjustments are independent of
* whether the chip is in binary mode or not. * whether the chip is in binary mode or not.
*/ */
if (yrs > 169) { if (yrs > 169)
spin_unlock_irqrestore(&rtc_lock, flags);
return -EINVAL; return -EINVAL;
}
if (yrs >= 100) if (yrs >= 100)
yrs -= 100; yrs -= 100;
@@ -297,6 +294,7 @@ int mc146818_set_time(struct rtc_time *time)
century = bin2bcd(century); century = bin2bcd(century);
} }
spin_lock_irqsave(&rtc_lock, flags);
save_control = CMOS_READ(RTC_CONTROL); save_control = CMOS_READ(RTC_CONTROL);
CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
save_freq_select = CMOS_READ(RTC_FREQ_SELECT); save_freq_select = CMOS_READ(RTC_FREQ_SELECT);