aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v10
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-23 17:07:38 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:31 -0500
commit496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch)
tree8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /arch/cris/arch-v10
parent57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff)
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r--arch/cris/arch-v10/drivers/sync_serial.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index c4b71710fb0e..a1c498d18d31 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -654,7 +654,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
654 654
655static unsigned int sync_serial_poll(struct file *file, poll_table *wait) 655static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
656{ 656{
657 int dev = MINOR(file->f_dentry->d_inode->i_rdev); 657 int dev = MINOR(file_inode(file)->i_rdev);
658 unsigned int mask = 0; 658 unsigned int mask = 0;
659 struct sync_port *port; 659 struct sync_port *port;
660 DEBUGPOLL(static unsigned int prev_mask = 0); 660 DEBUGPOLL(static unsigned int prev_mask = 0);
@@ -685,7 +685,7 @@ static int sync_serial_ioctl_unlocked(struct file *file,
685 int return_val = 0; 685 int return_val = 0;
686 unsigned long flags; 686 unsigned long flags;
687 687
688 int dev = MINOR(file->f_dentry->d_inode->i_rdev); 688 int dev = MINOR(file_inode(file)->i_rdev);
689 struct sync_port *port; 689 struct sync_port *port;
690 690
691 if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) { 691 if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) {
@@ -973,7 +973,7 @@ static long sync_serial_ioctl(struct file *file,
973static ssize_t sync_serial_write(struct file *file, const char *buf, 973static ssize_t sync_serial_write(struct file *file, const char *buf,
974 size_t count, loff_t *ppos) 974 size_t count, loff_t *ppos)
975{ 975{
976 int dev = MINOR(file->f_dentry->d_inode->i_rdev); 976 int dev = MINOR(file_inode(file)->i_rdev);
977 DECLARE_WAITQUEUE(wait, current); 977 DECLARE_WAITQUEUE(wait, current);
978 struct sync_port *port; 978 struct sync_port *port;
979 unsigned long flags; 979 unsigned long flags;
@@ -1097,7 +1097,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf,
1097static ssize_t sync_serial_read(struct file *file, char *buf, 1097static ssize_t sync_serial_read(struct file *file, char *buf,
1098 size_t count, loff_t *ppos) 1098 size_t count, loff_t *ppos)
1099{ 1099{
1100 int dev = MINOR(file->f_dentry->d_inode->i_rdev); 1100 int dev = MINOR(file_inode(file)->i_rdev);
1101 int avail; 1101 int avail;
1102 struct sync_port *port; 1102 struct sync_port *port;
1103 unsigned char *start; 1103 unsigned char *start;