Commit 49c39b49 authored by Grazvydas Ignotas's avatar Grazvydas Ignotas Committed by Linus Torvalds

fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

FBIO_WAITFORVSYNC is currently implemented by matroxfb, atyfb, intelfb and
more.  All of them keep redefining the same FBIO_WAITFORVSYNC macro over
and over again, so move it to linux/fb.h and clean up those duplicate
defines.
Signed-off-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Maik Broemme <mbroemme@plusserver.de>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: "Hiremath, Vaibhav" <hvaibhav@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1f9c3e1f
...@@ -1820,10 +1820,6 @@ struct atyclk { ...@@ -1820,10 +1820,6 @@ struct atyclk {
#define ATYIO_FEATW 0x41545903 /* ATY\03 */ #define ATYIO_FEATW 0x41545903 /* ATY\03 */
#endif #endif
#ifndef FBIO_WAITFORVSYNC
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#endif
static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg) static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
......
...@@ -371,10 +371,6 @@ struct intelfb_info { ...@@ -371,10 +371,6 @@ struct intelfb_info {
((dinfo)->chipset == INTEL_965G) || \ ((dinfo)->chipset == INTEL_965G) || \
((dinfo)->chipset == INTEL_965GM)) ((dinfo)->chipset == INTEL_965GM))
#ifndef FBIO_WAITFORVSYNC
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#endif
/*** function prototypes ***/ /*** function prototypes ***/
extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var); extern int intelfb_var_to_depth(const struct fb_var_screeninfo *var);
......
...@@ -37,7 +37,7 @@ struct dentry; ...@@ -37,7 +37,7 @@ struct dentry;
#define FBIOGET_HWCINFO 0x4616 #define FBIOGET_HWCINFO 0x4616
#define FBIOPUT_MODEINFO 0x4617 #define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618 #define FBIOGET_DISPINFO 0x4618
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */ #define FB_TYPE_PLANES 1 /* Non interleaved planes */
......
...@@ -33,6 +33,5 @@ struct ivtvfb_dma_frame { ...@@ -33,6 +33,5 @@ struct ivtvfb_dma_frame {
}; };
#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) #define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#endif #endif
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <asm/ioctl.h> #include <asm/ioctl.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/fb.h>
struct matroxioc_output_mode { struct matroxioc_output_mode {
__u32 output; /* which output */ __u32 output; /* which output */
...@@ -37,7 +38,5 @@ enum matroxfb_ctrl_id { ...@@ -37,7 +38,5 @@ enum matroxfb_ctrl_id {
MATROXFB_CID_LAST MATROXFB_CID_LAST
}; };
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
#endif #endif
...@@ -34,8 +34,6 @@ enum { LCDC_CLK_BUS, LCDC_CLK_PERIPHERAL, LCDC_CLK_EXTERNAL }; ...@@ -34,8 +34,6 @@ enum { LCDC_CLK_BUS, LCDC_CLK_PERIPHERAL, LCDC_CLK_EXTERNAL };
#define LCDC_FLAGS_HSCNT (1 << 3) /* Disable HSYNC during VBLANK */ #define LCDC_FLAGS_HSCNT (1 << 3) /* Disable HSYNC during VBLANK */
#define LCDC_FLAGS_DWCNT (1 << 4) /* Disable dotclock during blanking */ #define LCDC_FLAGS_DWCNT (1 << 4) /* Disable dotclock during blanking */
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
struct sh_mobile_lcdc_sys_bus_cfg { struct sh_mobile_lcdc_sys_bus_cfg {
unsigned long ldmt2r; unsigned long ldmt2r;
unsigned long ldmt3r; unsigned long ldmt3r;
......
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