From 9e87c0697ca64502e160b7261dd729b4aa7d63d9 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 16 Jan 2006 22:14:06 -0800
Subject: [PATCH] --- yaml --- r: 18635 b: refs/heads/master c:
 5ebdce726baf17eb66c5a1bf402ae6f161a082ed h: refs/heads/master i:   18633:
 2014209e09a548840fe38ed90cade5eb778070f5   18631:
 f49e5647b85b8906a6984821a281817cc369b8ae v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/video/sbuslib.c | 20 +++++++++-----------
 trunk/drivers/video/sbuslib.h |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 900d3d321183..85f48914d842 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f63776d0dccb6eb5f38beeac3eb9db735f7b5879
+refs/heads/master: 5ebdce726baf17eb66c5a1bf402ae6f161a082ed
diff --git a/trunk/drivers/video/sbuslib.c b/trunk/drivers/video/sbuslib.c
index 3a74a63dd4f2..55e6e2d60d3a 100644
--- a/trunk/drivers/video/sbuslib.c
+++ b/trunk/drivers/video/sbuslib.c
@@ -216,10 +216,10 @@ static int fbiogetputcmap(struct file *file, struct fb_info *info,
 	ret |= put_user(compat_ptr(addr), &p->blue);
 	if (ret)
 		return -EFAULT;
-	return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,
+	return info->fbops->fb_ioctl(info,
 			(cmd == FBIOPUTCMAP32) ?
 			FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC,
-			(unsigned long)p, info);
+			(unsigned long)p);
 }
 
 struct fbcursor32 {
@@ -260,12 +260,11 @@ static int fbiogscursor(struct file *file, struct fb_info *info,
 	ret |= put_user(compat_ptr(addr), &p->image);
 	if (ret)
 		return -EFAULT;
-	return info->fbops->fb_ioctl(file->f_dentry->d_inode, file,
-			FBIOSCURSOR, (unsigned long)p, info);
+	return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);
 }
 
-long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
-		unsigned long arg, struct fb_info *info)
+long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
+		unsigned long arg)
 {
 	switch (cmd) {
 	case FBIOGTYPE:
@@ -278,14 +277,13 @@ long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
 	case FBIOSCURPOS:
 	case FBIOGCURPOS:
 	case FBIOGCURMAX:
-		return info->fbops->fb_ioctl(file->f_dentry->d_inode,
-				file, cmd, arg, info);
+		return info->fbops->fb_ioctl(info, cmd, arg);
 	case FBIOPUTCMAP32:
-		return fbiogetputcmap(file, info, cmd, arg);
+		return fbiogetputcmap(info, cmd, arg);
 	case FBIOGETCMAP32:
-		return fbiogetputcmap(file, info, cmd, arg);
+		return fbiogetputcmap(info, cmd, arg);
 	case FBIOSCURSOR32:
-		return fbiogscursor(file, info, arg);
+		return fbiogscursor(info, arg);
 	default:
 		return -ENOIOCTLCMD;
 	}
diff --git a/trunk/drivers/video/sbuslib.h b/trunk/drivers/video/sbuslib.h
index b470e52ce9e2..f753939013ed 100644
--- a/trunk/drivers/video/sbuslib.h
+++ b/trunk/drivers/video/sbuslib.h
@@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
 int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
 			struct fb_info *info,
 			int type, int fb_depth, unsigned long fb_size);
-long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
-		unsigned long arg, struct fb_info *info);
+long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
+		unsigned long arg);
 
 #endif /* _SBUSLIB_H */