From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 12 Feb 2007 08:52:35 +0000 (-0800)
Subject: [PATCH] DS1302: local_irq_disable() is redundant after local_irq_save()
X-Git-Tag: v2.6.21-rc1~274^2~169
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efc47135e4b6f7e7d81332f50ef68e4a42819d20;p=linux-2.6

[PATCH] DS1302: local_irq_disable() is redundant after local_irq_save()

drivers/char/ds1302.c::get_rtc_time() contains local_irq_disable() call
after local_irq_save(). This looks redundant.

drivers/char/ds1302.c::rtc_ioctl() contains local_irq_disable() call after
local_irq_save(). This looks redundant.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/char/ds1302.c b/drivers/char/ds1302.c
index bcdb107aa9..fada6ddefb 100644
--- a/drivers/char/ds1302.c
+++ b/drivers/char/ds1302.c
@@ -120,7 +120,6 @@ get_rtc_time(struct rtc_time *rtc_tm)
 	unsigned long flags;
 
 	local_irq_save(flags);
-	local_irq_disable();
 
 	rtc_tm->tm_sec = CMOS_READ(RTC_SECONDS);
 	rtc_tm->tm_min = CMOS_READ(RTC_MINUTES);
@@ -219,7 +218,6 @@ rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 			BIN_TO_BCD(yrs);
 
 			local_irq_save(flags);
-			local_irq_disable();
 			CMOS_WRITE(yrs, RTC_YEAR);
 			CMOS_WRITE(mon, RTC_MONTH);
 			CMOS_WRITE(day, RTC_DAY_OF_MONTH);