[PATCH] Fix warning in omapfb_main.c

[PATCH] Fix warning in omapfb_main.c

[Dirk Behme]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]


ARM: OMAP: Fix warning because of changed ioctl() parameters

drivers/video/omap/omapfb_main.c:877: warning: initialization from
incompatible pointer type

Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>


[-- Attachment #2: omapfb_main_warning_fix.patch --]
[-- Type: text/plain, Size: 659 bytes --]

--- ./drivers/video/omap/omapfb_main.c_orig	2006-01-17 18:58:58.037572648 +0100
+++ ./drivers/video/omap/omapfb_main.c	2006-01-17 19:04:15.332336512 +0100
@@ -743,9 +743,8 @@ EXPORT_SYMBOL(omapfb_write_first_pixel);
  * graphics transformations, frame flipping support is provided through this
  * interface.
  */
-static int omapfb_ioctl(struct inode *inode, struct file *file,
-			unsigned int cmd, unsigned long arg,
-			struct fb_info *fbi)
+static int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd,
+                        unsigned long arg)
 {
 	struct omapfb_device	*fbdev = (struct omapfb_device *)fbi->par;
 	struct fb_ops		*ops = fbi->fbops;


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] Fix warning in omapfb_main.c

[Tony Lindgren]

* Dirk Behme <dirk.behme@de.bosch.com> [060117 10:52]:
> 
> ARM: OMAP: Fix warning because of changed ioctl() parameters
> 
> drivers/video/omap/omapfb_main.c:877: warning: initialization from
> incompatible pointer type
> 
> Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
> 

> --- ./drivers/video/omap/omapfb_main.c_orig	2006-01-17 18:58:58.037572648 +0100
> +++ ./drivers/video/omap/omapfb_main.c	2006-01-17 19:04:15.332336512 +0100
> @@ -743,9 +743,8 @@ EXPORT_SYMBOL(omapfb_write_first_pixel);
>   * graphics transformations, frame flipping support is provided through this
>   * interface.
>   */
> -static int omapfb_ioctl(struct inode *inode, struct file *file,
> -			unsigned int cmd, unsigned long arg,
> -			struct fb_info *fbi)
> +static int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd,
> +                        unsigned long arg)
>  {
>  	struct omapfb_device	*fbdev = (struct omapfb_device *)fbi->par;
>  	struct fb_ops		*ops = fbi->fbops;
> 

Pushing this one too.

Tony