git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
rtc
/
rtc-vr41xx.c
diff --git
a/drivers/rtc/rtc-vr41xx.c
b/drivers/rtc/rtc-vr41xx.c
index
277596c
..
596764f
100644
(file)
--- a/
drivers/rtc/rtc-vr41xx.c
+++ b/
drivers/rtc/rtc-vr41xx.c
@@
-30,7
+30,7
@@
#include <asm/div64.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/div64.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <asm/vr41xx/
vr41xx
.h>
+#include <asm/vr41xx/
irq
.h>
MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
MODULE_DESCRIPTION("NEC VR4100 series RTC driver");
MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");
MODULE_DESCRIPTION("NEC VR4100 series RTC driver");
@@
-81,7
+81,6
@@
MODULE_LICENSE("GPL");
#define RTC_FREQUENCY 32768
#define MAX_PERIODIC_RATE 6553
#define RTC_FREQUENCY 32768
#define MAX_PERIODIC_RATE 6553
-#define MAX_USER_PERIODIC_RATE 64
static void __iomem *rtc1_base;
static void __iomem *rtc2_base;
static void __iomem *rtc1_base;
static void __iomem *rtc2_base;
@@
-94,7
+93,7
@@
static void __iomem *rtc2_base;
static unsigned long epoch = 1970; /* Jan 1 1970 00:00:00 */
static unsigned long epoch = 1970; /* Jan 1 1970 00:00:00 */
-static
spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(rtc_lock)
;
static char rtc_name[] = "RTC";
static unsigned long periodic_frequency;
static unsigned long periodic_count;
static char rtc_name[] = "RTC";
static unsigned long periodic_frequency;
static unsigned long periodic_count;
@@
-240,9
+239,6
@@
static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
if (arg > MAX_PERIODIC_RATE)
return -EINVAL;
if (arg > MAX_PERIODIC_RATE)
return -EINVAL;
- if (arg > MAX_USER_PERIODIC_RATE && capable(CAP_SYS_RESOURCE) == 0)
- return -EACCES;
-
periodic_frequency = arg;
count = RTC_FREQUENCY;
periodic_frequency = arg;
count = RTC_FREQUENCY;
@@
-263,10
+259,6
@@
static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
/* Doesn't support before 1900 */
if (arg < 1900)
return -EINVAL;
/* Doesn't support before 1900 */
if (arg < 1900)
return -EINVAL;
-
- if (capable(CAP_SYS_TIME) == 0)
- return -EACCES;
-
epoch = arg;
break;
default:
epoch = arg;
break;
default:
@@
-353,11
+345,11
@@
static int __devinit rtc_probe(struct platform_device *pdev)
spin_unlock_irq(&rtc_lock);
irq = ELAPSEDTIME_IRQ;
spin_unlock_irq(&rtc_lock);
irq = ELAPSEDTIME_IRQ;
- retval = request_irq(irq, elapsedtime_interrupt,
SA_INTERRUPT
,
+ retval = request_irq(irq, elapsedtime_interrupt,
IRQF_DISABLED
,
"elapsed_time", pdev);
if (retval == 0) {
irq = RTCLONG1_IRQ;
"elapsed_time", pdev);
if (retval == 0) {
irq = RTCLONG1_IRQ;
- retval = request_irq(irq, rtclong1_interrupt,
SA_INTERRUPT
,
+ retval = request_irq(irq, rtclong1_interrupt,
IRQF_DISABLED
,
"rtclong1", pdev);
}
"rtclong1", pdev);
}