Commit 7fa95f72 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert sbus 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d20343e7

drivers/sbus/char/bpp.c

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static long read_ecp(unsigned minor, char __user *c, unsigned long cnt) 
static ssize_t bpp_read(struct file *f, char __user *c, size_t cnt, loff_t * ppos)

{

      long rc;

      unsigned minor = iminor(f->f_dentry->d_inode);

      unsigned minor = iminor(f->f_path.dentry->d_inode);

      if (minor >= BPP_NO) return -ENODEV;

      if (!instances[minor].present) return -ENODEV;
@@ -774,7 +774,7 @@ static long write_ecp(unsigned minor, const char __user *c, unsigned long cnt) 
static ssize_t bpp_write(struct file *f, const char __user *c, size_t cnt, loff_t * ppos)

{

      long errno = 0;

      unsigned minor = iminor(f->f_dentry->d_inode);

      unsigned minor = iminor(f->f_path.dentry->d_inode);

      if (minor >= BPP_NO) return -ENODEV;

      if (!instances[minor].present) return -ENODEV;

drivers/sbus/char/cpwatchdog.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static long wd_compat_ioctl(struct file *file, unsigned int cmd, 
	case WIOCSTOP:

	case WIOCGSTAT:

		lock_kernel();

		rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg);

		rval = wd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);

		unlock_kernel();

		break;

	/* everything else is handled by the generic compat layer */

drivers/sbus/char/display7seg.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	__u8 ireg = 0;

	int error = 0;



	if (D7S_MINOR != iminor(file->f_dentry->d_inode))

	if (D7S_MINOR != iminor(file->f_path.dentry->d_inode))

		return -ENODEV;



	lock_kernel();

drivers/sbus/char/openprom.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd, 
	case OPROMSETCUR:

	case OPROMPCI2NODE:

	case OPROMPATH2NODE:

		rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg);

		rval = openprom_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);

		break;

	}

drivers/sbus/char/vfc_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int vfc_mmap(struct file *file, struct vm_area_struct *vma) 
	unsigned int map_size, ret, map_offset;

	struct vfc_dev *dev;

	

	dev = vfc_get_dev_ptr(iminor(file->f_dentry->d_inode));

	dev = vfc_get_dev_ptr(iminor(file->f_path.dentry->d_inode));

	if(dev == NULL)

		return -ENODEV;