aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r--drivers/sbus/char/bpp.c4
-rw-r--r--drivers/sbus/char/cpwatchdog.c2
-rw-r--r--drivers/sbus/char/display7seg.c2
-rw-r--r--drivers/sbus/char/openprom.c2
-rw-r--r--drivers/sbus/char/vfc_dev.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 385f4f768311..ac7d1258efee 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -621,7 +621,7 @@ static long read_ecp(unsigned minor, char __user *c, unsigned long cnt)
621static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos) 621static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos)
622{ 622{
623 long rc; 623 long rc;
624 unsigned minor = iminor(f->f_dentry->d_inode); 624 unsigned minor = iminor(f->f_path.dentry->d_inode);
625 if (minor >= BPP_NO) return -ENODEV; 625 if (minor >= BPP_NO) return -ENODEV;
626 if (!instances[minor].present) return -ENODEV; 626 if (!instances[minor].present) return -ENODEV;
627 627
@@ -774,7 +774,7 @@ static long write_ecp(unsigned minor, const char __user *c, unsigned long cnt)
774static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos) 774static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos)
775{ 775{
776 long errno = 0; 776 long errno = 0;
777 unsigned minor = iminor(f->f_dentry->d_inode); 777 unsigned minor = iminor(f->f_path.dentry->d_inode);
778 if (minor >= BPP_NO) return -ENODEV; 778 if (minor >= BPP_NO) return -ENODEV;
779 if (!instances[minor].present) return -ENODEV; 779 if (!instances[minor].present) return -ENODEV;
780 780
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index f5803ecb1999..ad1c7db96cb4 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -404,7 +404,7 @@ static long wd_compat_ioctl(struct file *file, unsigned int cmd,
404 case WIOCSTOP: 404 case WIOCSTOP:
405 case WIOCGSTAT: 405 case WIOCGSTAT:
406 lock_kernel(); 406 lock_kernel();
407 rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg); 407 rval = wd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
408 unlock_kernel(); 408 unlock_kernel();
409 break; 409 break;
410 /* everything else is handled by the generic compat layer */ 410 /* everything else is handled by the generic compat layer */
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index d92bc8827a9e..a4909e0c7f83 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -121,7 +121,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
121 __u8 ireg = 0; 121 __u8 ireg = 0;
122 int error = 0; 122 int error = 0;
123 123
124 if (D7S_MINOR != iminor(file->f_dentry->d_inode)) 124 if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))
125 return -ENODEV; 125 return -ENODEV;
126 126
127 lock_kernel(); 127 lock_kernel();
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 81ba2d71cee2..4e2a0e2dcc2e 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -676,7 +676,7 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
676 case OPROMSETCUR: 676 case OPROMSETCUR:
677 case OPROMPCI2NODE: 677 case OPROMPCI2NODE:
678 case OPROMPATH2NODE: 678 case OPROMPATH2NODE:
679 rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg); 679 rval = openprom_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
680 break; 680 break;
681 } 681 }
682 682
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 55b2b31bd7ab..2722af5d3404 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -610,7 +610,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma)
610 unsigned int map_size, ret, map_offset; 610 unsigned int map_size, ret, map_offset;
611 struct vfc_dev *dev; 611 struct vfc_dev *dev;
612 612
613 dev = vfc_get_dev_ptr(iminor(file->f_dentry->d_inode)); 613 dev = vfc_get_dev_ptr(iminor(file->f_path.dentry->d_inode));
614 if(dev == NULL) 614 if(dev == NULL)
615 return -ENODEV; 615 return -ENODEV;
616 616