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

Commit 88efe137 authored by Mark Zhan's avatar Mark Zhan Committed by Linus Torvalds
Browse files

rtc-dev: no need to convert file->private_data to rtc device 



In rtc-dev.c, when a rtc device is opened, file->private_data is already
attached with the rtc device pointer, so there is no need to call
to_rtc_device() to convert file->private_data to a rtc device pointer.

Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarMark Zhan <rongkai.zhan@windriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97144c67

drivers/rtc/rtc-dev.c

+4 −4
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int set_uie(struct rtc_device *rtc) 
static ssize_t

rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)

{

	struct rtc_device *rtc = to_rtc_device(file->private_data);

	struct rtc_device *rtc = file->private_data;



	DECLARE_WAITQUEUE(wait, current);

	unsigned long data;
@@ -196,7 +196,7 @@ rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 


static unsigned int rtc_dev_poll(struct file *file, poll_table *wait)

{

	struct rtc_device *rtc = to_rtc_device(file->private_data);

	struct rtc_device *rtc = file->private_data;

	unsigned long data;



	poll_wait(file, &rtc->irq_queue, wait);
@@ -396,7 +396,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, 


static int rtc_dev_release(struct inode *inode, struct file *file)

{

	struct rtc_device *rtc = to_rtc_device(file->private_data);

	struct rtc_device *rtc = file->private_data;



#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL

	clear_uie(rtc);
@@ -410,7 +410,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file) 


static int rtc_dev_fasync(int fd, struct file *file, int on)

{

	struct rtc_device *rtc = to_rtc_device(file->private_data);

	struct rtc_device *rtc = file->private_data;

	return fasync_helper(fd, file, on, &rtc->async_queue);

}