diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/video/atafb.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 45 |
1 files changed, 8 insertions, 37 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 905e8524a..3ad46bc68 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -2426,40 +2426,6 @@ do_install_cmap(int con, struct fb_info *info) 1, fbhw->setcolreg, info); } - - /* - * Open/Release the frame buffer device - */ - -static int atafb_open(struct fb_info *info, int user) -{ - /* - * Nothing, only a usage count for the moment - */ - - MOD_INC_USE_COUNT; - return(0); -} - -static int atafb_release(struct fb_info *info, int user) -{ - MOD_DEC_USE_COUNT; - return(0); -} - - -static int -atafb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info) -{ - struct atafb_par par; - if (con == -1) - atafb_get_par(&par); - else - fbhw->decode_var(&fb_display[con].var,&par); - memset(fix, 0, sizeof(struct fb_fix_screeninfo)); - return fbhw->encode_fix(fix, &par); -} - static int atafb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info) { @@ -2658,9 +2624,14 @@ atafb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, } static struct fb_ops atafb_ops = { - atafb_open, atafb_release, atafb_get_fix, atafb_get_var, - atafb_set_var, atafb_get_cmap, atafb_set_cmap, - atafb_pan_display, atafb_ioctl + owner: THIS_MODULE, + fb_get_fix: atafb_get_fix, + fb_get_var: atafb_get_var, + fb_set_var: atafb_set_var, + fb_get_cmap: atafb_get_cmap, + fb_set_cmap: atafb_set_cmap, + fb_pan_display: atafb_pan_display, + fb_ioctl: atafb_ioctl, }; static void |