Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7fa95f726aba6033d7baffcfda484c31b8cfe153

Authored by Josef Sipek
Committed by Linus Torvalds
1 parent d20343e740

[PATCH] struct path: convert sbus 

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>

Showing 5 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/sbus/char/bpp.c
Diff comments   View file @ 7fa95f7
... ... @@ -621,7 +621,7 @@
621 621 static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos)
622 622 {
623 623 long rc;
624   - unsigned minor = iminor(f->f_dentry->d_inode);
  624 + unsigned minor = iminor(f->f_path.dentry->d_inode);
625 625 if (minor >= BPP_NO) return -ENODEV;
626 626 if (!instances[minor].present) return -ENODEV;
627 627  
... ... @@ -774,7 +774,7 @@
774 774 static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos)
775 775 {
776 776 long errno = 0;
777   - unsigned minor = iminor(f->f_dentry->d_inode);
  777 + unsigned minor = iminor(f->f_path.dentry->d_inode);
778 778 if (minor >= BPP_NO) return -ENODEV;
779 779 if (!instances[minor].present) return -ENODEV;
780 780  
drivers/sbus/char/cpwatchdog.c
Diff comments   View file @ 7fa95f7
... ... @@ -404,7 +404,7 @@
404 404 case WIOCSTOP:
405 405 case WIOCGSTAT:
406 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 408 unlock_kernel();
409 409 break;
410 410 /* everything else is handled by the generic compat layer */
drivers/sbus/char/display7seg.c
Diff comments   View file @ 7fa95f7
... ... @@ -121,7 +121,7 @@
121 121 __u8 ireg = 0;
122 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 125 return -ENODEV;
126 126  
127 127 lock_kernel();
drivers/sbus/char/openprom.c
Diff comments   View file @ 7fa95f7
... ... @@ -676,7 +676,7 @@
676 676 case OPROMSETCUR:
677 677 case OPROMPCI2NODE:
678 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 680 break;
681 681 }
682 682  
drivers/sbus/char/vfc_dev.c
Diff comments   View file @ 7fa95f7
... ... @@ -610,7 +610,7 @@
610 610 unsigned int map_size, ret, map_offset;
611 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 614 if(dev == NULL)
615 615 return -ENODEV;
616 616