new helper: file_inode(file)

[linux-2.6-block.git] / drivers / media / rc / lirc_dev.c

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index ca12d3289bfe90a886da3e25ef5c40c9a2a6452f..35002367485c603b2df91f209501366912467ee2 100644 (file)
--- 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__);