Skip to contentSkip to conversation

Fix warning in omapfb_main.c

PATCH In review Dirk Behme 2 participants 2 messages Jan 17, 2006 – Jan 20, 2006 Framebuffer layer

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 Fix warning in omapfb_main.c

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 renamed from drivers/video/omap/omapfb_main.c_orig +2 -3
@@ -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;
#1 lore raw
Quoted 14 lines · Dirk Behme

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 renamed from drivers/video/omap/omapfb_main.c_orig +0 -0
@@ -743,9 +743,8 @@ EXPORT_SYMBOL(omapfb_write_first_pixel);
  * graphics transformations, frame flipping support is provided through this

drivers/video/omap/omapfb_main.c EXPORT_SYMBOL(omapfb_write_first_pixel); · line 750

Quoted 10 lines
drivers/video/omap/omapfb_main.c renamed from drivers/video/omap/omapfb_main.c_orig +2 -3
  * 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