diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-02-06 04:38:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:14 -0500 |
commit | 102f4a02de5c7217a04ccbbc24f35224b98bb183 (patch) | |
tree | 0da07b443079c2c1b326e70912efa380c3f77de1 /drivers/char/ip27-rtc.c | |
parent | 9d8af78b07976d4d84e0df491abd4e9db848d0ad (diff) |
ip27-rtc: convert ioctl to unlocked_ioctl
Convert ioctl call to unlocked_ioctl form. It is possible (in that simple
way) due to a spinlock protection.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ip27-rtc.c')
-rw-r--r-- | drivers/char/ip27-rtc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c index 932264a657d0..86e6538a77b0 100644 --- a/drivers/char/ip27-rtc.c +++ b/drivers/char/ip27-rtc.c | |||
@@ -46,8 +46,8 @@ | |||
46 | #include <asm/sn/sn0/hub.h> | 46 | #include <asm/sn/sn0/hub.h> |
47 | #include <asm/sn/sn_private.h> | 47 | #include <asm/sn/sn_private.h> |
48 | 48 | ||
49 | static int rtc_ioctl(struct inode *inode, struct file *file, | 49 | static long rtc_ioctl(struct file *filp, unsigned int cmd, |
50 | unsigned int cmd, unsigned long arg); | 50 | unsigned long arg); |
51 | 51 | ||
52 | static int rtc_read_proc(char *page, char **start, off_t off, | 52 | static int rtc_read_proc(char *page, char **start, off_t off, |
53 | int count, int *eof, void *data); | 53 | int count, int *eof, void *data); |
@@ -75,8 +75,7 @@ static unsigned long epoch = 1970; /* year corresponding to 0x00 */ | |||
75 | static const unsigned char days_in_mo[] = | 75 | static const unsigned char days_in_mo[] = |
76 | {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; | 76 | {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; |
77 | 77 | ||
78 | static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 78 | static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
79 | unsigned long arg) | ||
80 | { | 79 | { |
81 | 80 | ||
82 | struct rtc_time wtime; | 81 | struct rtc_time wtime; |
@@ -197,7 +196,7 @@ static int rtc_release(struct inode *inode, struct file *file) | |||
197 | 196 | ||
198 | static const struct file_operations rtc_fops = { | 197 | static const struct file_operations rtc_fops = { |
199 | .owner = THIS_MODULE, | 198 | .owner = THIS_MODULE, |
200 | .ioctl = rtc_ioctl, | 199 | .unlocked_ioctl = rtc_ioctl, |
201 | .open = rtc_open, | 200 | .open = rtc_open, |
202 | .release = rtc_release, | 201 | .release = rtc_release, |
203 | }; | 202 | }; |