3 files changed, 6 insertions, 11 deletions

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index b8c18dcdd2c4..88f7b50d541c 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -399,11 +399,9 @@ static int file_release(struct inode *inode, struct file *filp)
 
 static unsigned int file_poll(struct file *file, poll_table * wait)
 {
-        int minor;
+        int minor = iminor(file_inode(file));
         unsigned int mask = 0;
 
-        minor = iminor(file->f_path.dentry->d_inode);
-
         poll_wait(file, &channel_wqs[minor].rt_queue, wait);
         poll_wait(file, &channel_wqs[minor].lx_queue, wait);
 
@@ -424,7 +422,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
                          loff_t * ppos)
 {
-        int minor = iminor(file->f_path.dentry->d_inode);
+        int minor = iminor(file_inode(file));
 
         /* data available? */
         if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@ -437,11 +435,8 @@ static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
 static ssize_t file_write(struct file *file, const char __user * buffer,
                           size_t count, loff_t * ppos)
 {
-        int minor;
-        struct rtlx_channel *rt;
-
-        minor = iminor(file->f_path.dentry->d_inode);
-        rt = &rtlx->channel[minor];
+        int minor = iminor(file_inode(file));
+        struct rtlx_channel *rt = &rtlx->channel[minor];
 
         /* any space left... */
         if (!rtlx_write_poll(minor)) {
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index eec690af6581..d75a5289d9b3 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1149,7 +1149,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
         size_t ret = count;
         struct vpe *v;
 
-        if (iminor(file->f_path.dentry->d_inode) != minor)
+        if (iminor(file_inode(file)) != minor)
                 return -ENODEV;
 
         v = get_vpe(tclimit);
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c
index 8e388da1926f..c592bc8b8c99 100644
--- a/arch/mips/lasat/picvue_proc.c
+++ b/arch/mips/lasat/picvue_proc.c
@@ -64,7 +64,7 @@ static int pvc_line_proc_open(struct inode *inode, struct file *file)
 static ssize_t pvc_line_proc_write(struct file *file, const char __user *buf,
                                    size_t count, loff_t *pos)
 {
-        int lineno = *(int *)PDE(file->f_path.dentry->d_inode)->data;
+        int lineno = *(int *)PDE(file_inode(file))->data;
         char kbuf[PVC_LINELEN];
         size_t len;