aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/hecubafb.c
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-05-08 03:39:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:30 -0400
commit3f9b0880e4a96b02bc0131451f2f6231cd90bd94 (patch)
treea47339c46ab03918b24d501df54884c277326a74 /drivers/video/hecubafb.c
parent87b4884935d387acc4c4418da6a75387bfcc24b9 (diff)
fbdev: pass struct fb_info to fb_read and fb_write
It is unnecessary to pass struct file to fb_read() and fb_write() in struct fb_ops. For consistency with the other methods, pass struct fb_info instead. Signed-off-by: Antonino Daplas <adaplas@gmail.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/hecubafb.c')
-rw-r--r--drivers/video/hecubafb.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index 0ade72590998..3ec0e97f36e4 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -267,12 +267,9 @@ static void hecubafb_imageblit(struct fb_info *info,
267 * this is the slow path from userspace. they can seek and write to 267 * this is the slow path from userspace. they can seek and write to
268 * the fb. it's inefficient to do anything less than a full screen draw 268 * the fb. it's inefficient to do anything less than a full screen draw
269 */ 269 */
270static ssize_t hecubafb_write(struct file *file, const char __user *buf, 270static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
271 size_t count, loff_t *ppos) 271 size_t count, loff_t *ppos)
272{ 272{
273 struct inode *inode;
274 int fbidx;
275 struct fb_info *info;
276 unsigned long p; 273 unsigned long p;
277 int err=-EINVAL; 274 int err=-EINVAL;
278 struct hecubafb_par *par; 275 struct hecubafb_par *par;
@@ -280,13 +277,6 @@ static ssize_t hecubafb_write(struct file *file, const char __user *buf,
280 unsigned int fbmemlength; 277 unsigned int fbmemlength;
281 278
282 p = *ppos; 279 p = *ppos;
283 inode = file->f_dentry->d_inode;
284 fbidx = iminor(inode);
285 info = registered_fb[fbidx];
286
287 if (!info || !info->screen_base)
288 return -ENODEV;
289
290 par = info->par; 280 par = info->par;
291 xres = info->var.xres; 281 xres = info->var.xres;
292 fbmemlength = (xres * info->var.yres)/8; 282 fbmemlength = (xres * info->var.yres)/8;