From 80a56605aa605d501b1f090891f74b5c58a557ee Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 6 Feb 2008 01:38:53 -0800 Subject: [PATCH] --- yaml --- r: 83539 b: refs/heads/master c: 102f4a02de5c7217a04ccbbc24f35224b98bb183 h: refs/heads/master i: 83537: ecaef3a173daf343833e035be99f6fb50f5df74a 83535: 457cd77da391b72ca5415a1e0165b03cbb6c0404 v: v3 --- [refs] | 2 +- trunk/drivers/char/ip27-rtc.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fdf283e4ea21..888107729e2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d8af78b07976d4d84e0df491abd4e9db848d0ad +refs/heads/master: 102f4a02de5c7217a04ccbbc24f35224b98bb183 diff --git a/trunk/drivers/char/ip27-rtc.c b/trunk/drivers/char/ip27-rtc.c index 932264a657d0..86e6538a77b0 100644 --- a/trunk/drivers/char/ip27-rtc.c +++ b/trunk/drivers/char/ip27-rtc.c @@ -46,8 +46,8 @@ #include #include -static int rtc_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg); +static long rtc_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg); static int rtc_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data); @@ -75,8 +75,7 @@ static unsigned long epoch = 1970; /* year corresponding to 0x00 */ static const unsigned char days_in_mo[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; -static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg) +static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct rtc_time wtime; @@ -197,7 +196,7 @@ static int rtc_release(struct inode *inode, struct file *file) static const struct file_operations rtc_fops = { .owner = THIS_MODULE, - .ioctl = rtc_ioctl, + .unlocked_ioctl = rtc_ioctl, .open = rtc_open, .release = rtc_release, };