diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:50 -0500 |
commit | ad9a824e004067a3d888567a991603f1ac36efb2 (patch) | |
tree | 2258ccc3ded8a8e0723bea92cfdcda5ed84beeb4 /drivers/video/fbmem.c | |
parent | 723731b2eef6599cf09af1fbfe0b12857b439e2d (diff) |
[PATCH] struct path: convert video
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmem.c')
-rw-r--r-- | drivers/video/fbmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index e973a87fbb01..00a216879785 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -572,7 +572,7 @@ static ssize_t | |||
572 | fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | 572 | fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) |
573 | { | 573 | { |
574 | unsigned long p = *ppos; | 574 | unsigned long p = *ppos; |
575 | struct inode *inode = file->f_dentry->d_inode; | 575 | struct inode *inode = file->f_path.dentry->d_inode; |
576 | int fbidx = iminor(inode); | 576 | int fbidx = iminor(inode); |
577 | struct fb_info *info = registered_fb[fbidx]; | 577 | struct fb_info *info = registered_fb[fbidx]; |
578 | u32 *buffer, *dst; | 578 | u32 *buffer, *dst; |
@@ -647,7 +647,7 @@ static ssize_t | |||
647 | fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | 647 | fb_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) |
648 | { | 648 | { |
649 | unsigned long p = *ppos; | 649 | unsigned long p = *ppos; |
650 | struct inode *inode = file->f_dentry->d_inode; | 650 | struct inode *inode = file->f_path.dentry->d_inode; |
651 | int fbidx = iminor(inode); | 651 | int fbidx = iminor(inode); |
652 | struct fb_info *info = registered_fb[fbidx]; | 652 | struct fb_info *info = registered_fb[fbidx]; |
653 | u32 *buffer, *src; | 653 | u32 *buffer, *src; |
@@ -1081,7 +1081,7 @@ static int fb_get_fscreeninfo(struct inode *inode, struct file *file, | |||
1081 | static long | 1081 | static long |
1082 | fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 1082 | fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
1083 | { | 1083 | { |
1084 | struct inode *inode = file->f_dentry->d_inode; | 1084 | struct inode *inode = file->f_path.dentry->d_inode; |
1085 | int fbidx = iminor(inode); | 1085 | int fbidx = iminor(inode); |
1086 | struct fb_info *info = registered_fb[fbidx]; | 1086 | struct fb_info *info = registered_fb[fbidx]; |
1087 | struct fb_ops *fb = info->fbops; | 1087 | struct fb_ops *fb = info->fbops; |
@@ -1121,7 +1121,7 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
1121 | static int | 1121 | static int |
1122 | fb_mmap(struct file *file, struct vm_area_struct * vma) | 1122 | fb_mmap(struct file *file, struct vm_area_struct * vma) |
1123 | { | 1123 | { |
1124 | int fbidx = iminor(file->f_dentry->d_inode); | 1124 | int fbidx = iminor(file->f_path.dentry->d_inode); |
1125 | struct fb_info *info = registered_fb[fbidx]; | 1125 | struct fb_info *info = registered_fb[fbidx]; |
1126 | struct fb_ops *fb = info->fbops; | 1126 | struct fb_ops *fb = info->fbops; |
1127 | unsigned long off; | 1127 | unsigned long off; |