3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/pci/zoran/zoran_procfs.c b/drivers/media/pci/zoran/zoran_procfs.c
index f1423b777db1..e084b0a21b1b 100644
--- a/drivers/media/pci/zoran/zoran_procfs.c
+++ b/drivers/media/pci/zoran/zoran_procfs.c
@@ -137,7 +137,7 @@ static int zoran_open(struct inode *inode, struct file *file)
 static ssize_t zoran_write(struct file *file, const char __user *buffer,
                         size_t count, loff_t *ppos)
 {
-        struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
+        struct zoran *zr = PDE(file_inode(file))->data;
         char *string, *sp;
         char *line, *ldelim, *varname, *svar, *tdelim;
 
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index ca12d3289bfe..35002367485c 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -531,7 +531,7 @@ EXPORT_SYMBOL(lirc_dev_fop_close);
 
 unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
         unsigned int ret;
 
         if (!ir) {
@@ -565,7 +565,7 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u32 mode;
         int result = 0;
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
 
         if (!ir) {
                 printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);
@@ -650,7 +650,7 @@ ssize_t lirc_dev_fop_read(struct file *file,
                           size_t length,
                           loff_t *ppos)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
         unsigned char *buf;
         int ret = 0, written = 0;
         DECLARE_WAITQUEUE(wait, current);
@@ -754,10 +754,10 @@ void *lirc_get_pdata(struct file *file)
 {
         void *data = NULL;
 
-        if (file && file->f_dentry && file->f_dentry->d_inode &&
-            file->f_dentry->d_inode->i_rdev) {
+        if (file && file->f_dentry && file_inode(file) &&
+            file_inode(file)->i_rdev) {
                 struct irctl *ir;
-                ir = irctls[iminor(file->f_dentry->d_inode)];
+                ir = irctls[iminor(file_inode(file))];
                 data = ir->d.data;
         }
 
@@ -769,7 +769,7 @@ EXPORT_SYMBOL(lirc_get_pdata);
 ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
                            size_t length, loff_t *ppos)
 {
-        struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+        struct irctl *ir = irctls[iminor(file_inode(file))];
 
         if (!ir) {
                 printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 98dcad9c8a3b..870de1d5667a 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -222,7 +222,7 @@ static struct class video_class = {
 
 struct video_device *video_devdata(struct file *file)
 {
-        return video_device[iminor(file->f_path.dentry->d_inode)];
+        return video_device[iminor(file_inode(file))];
 }
 EXPORT_SYMBOL(video_devdata);