Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 102f4a02 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

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: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Acked-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d8af78b

drivers/char/ip27-rtc.c

+4 −5
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
#include <asm/sn/sn0/hub.h>

#include <asm/sn/sn_private.h>



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,

};