Commit c7006638 authored by David S. Miller's avatar David S. Miller

[SPARC]: Fix sbusfb build.

sbusfb_compat_ioctl() needs to return int, not long, as that
is what the fb_ops->fb_compat_ioctl method prototype wants.

Need to git rid of the "struct file *file" first argument to
fbiogetputcmap() and fbiogscursor() to match calls done in
sbusfb_compat_ioctl().
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ae61388
...@@ -199,8 +199,7 @@ struct fbcmap32 { ...@@ -199,8 +199,7 @@ struct fbcmap32 {
#define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32) #define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)
#define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32) #define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)
static int fbiogetputcmap(struct file *file, struct fb_info *info, static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
struct fbcmap32 __user *argp = (void __user *)arg; struct fbcmap32 __user *argp = (void __user *)arg;
struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p)); struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p));
...@@ -236,8 +235,7 @@ struct fbcursor32 { ...@@ -236,8 +235,7 @@ struct fbcursor32 {
#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32) #define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32) #define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
static int fbiogscursor(struct file *file, struct fb_info *info, static int fbiogscursor(struct fb_info *info, unsigned long arg)
unsigned long arg)
{ {
struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p)); struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));
struct fbcursor32 __user *argp = (void __user *)arg; struct fbcursor32 __user *argp = (void __user *)arg;
...@@ -263,8 +261,7 @@ static int fbiogscursor(struct file *file, struct fb_info *info, ...@@ -263,8 +261,7 @@ static int fbiogscursor(struct file *file, struct fb_info *info,
return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p); return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);
} }
long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
unsigned long arg)
{ {
switch (cmd) { switch (cmd) {
case FBIOGTYPE: case FBIOGTYPE:
......
...@@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map, ...@@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
struct fb_info *info, struct fb_info *info,
int type, int fb_depth, unsigned long fb_size); int type, int fb_depth, unsigned long fb_size);
long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg); unsigned long arg);
#endif /* _SBUSLIB_H */ #endif /* _SBUSLIB_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment