diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /drivers/video | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fb_defio.c | 2 | ||||
-rw-r--r-- | drivers/video/fbmem.c | 2 | ||||
-rw-r--r-- | drivers/video/msm/mdp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 88cad6b8b479..900aa4ecd617 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
@@ -69,7 +69,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma, | |||
69 | int fb_deferred_io_fsync(struct file *file, loff_t start, loff_t end, int datasync) | 69 | int fb_deferred_io_fsync(struct file *file, loff_t start, loff_t end, int datasync) |
70 | { | 70 | { |
71 | struct fb_info *info = file->private_data; | 71 | struct fb_info *info = file->private_data; |
72 | struct inode *inode = file->f_path.dentry->d_inode; | 72 | struct inode *inode = file_inode(file); |
73 | int err = filemap_write_and_wait_range(inode->i_mapping, start, end); | 73 | int err = filemap_write_and_wait_range(inode->i_mapping, start, end); |
74 | if (err) | 74 | if (err) |
75 | return err; | 75 | return err; |
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 3ff0105a496a..bf01980c9554 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -727,7 +727,7 @@ static const struct file_operations fb_proc_fops = { | |||
727 | */ | 727 | */ |
728 | static struct fb_info *file_fb_info(struct file *file) | 728 | static struct fb_info *file_fb_info(struct file *file) |
729 | { | 729 | { |
730 | struct inode *inode = file->f_path.dentry->d_inode; | 730 | struct inode *inode = file_inode(file); |
731 | int fbidx = iminor(inode); | 731 | int fbidx = iminor(inode); |
732 | struct fb_info *info = registered_fb[fbidx]; | 732 | struct fb_info *info = registered_fb[fbidx]; |
733 | 733 | ||
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index f2566c19e71c..113c7876c855 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c | |||
@@ -261,7 +261,7 @@ int get_img(struct mdp_img *img, struct fb_info *info, | |||
261 | if (f.file == NULL) | 261 | if (f.file == NULL) |
262 | return -1; | 262 | return -1; |
263 | 263 | ||
264 | if (MAJOR(f.file->f_dentry->d_inode->i_rdev) == FB_MAJOR) { | 264 | if (MAJOR(file_inode(f.file)->i_rdev) == FB_MAJOR) { |
265 | *start = info->fix.smem_start; | 265 | *start = info->fix.smem_start; |
266 | *len = info->fix.smem_len; | 266 | *len = info->fix.smem_len; |
267 | } else | 267 | } else |