Merge tag 'mac80211-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / video / fbdev / controlfb.c

diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index fdadef979238f06c6a6e9bcf77bf0f15f5ee3043..080fdd2a70f3956c9ea4b37b1b35ca0d14f4aa4b 100644 (file)
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -218,7 +218,8 @@ static int controlfb_check_var (struct fb_var_screeninfo *var, struct fb_info *i
  */
 static int controlfb_set_par (struct fb_info *info)
 {
-       struct fb_info_control *p = (struct fb_info_control *) info;
+       struct fb_info_control *p =
+               container_of(info, struct fb_info_control, info);
        struct fb_par_control par;
        int err;
 
@@ -258,7 +259,8 @@ static int controlfb_pan_display(struct fb_var_screeninfo *var,
                                 struct fb_info *info)
 {
        unsigned int xoffset, hstep;
-       struct fb_info_control *p = (struct fb_info_control *)info;
+       struct fb_info_control *p =
+               container_of(info, struct fb_info_control, info);
        struct fb_par_control *par = &p->par;
 
        /*
@@ -309,7 +311,8 @@ static int controlfb_mmap(struct fb_info *info,
 
 static int controlfb_blank(int blank_mode, struct fb_info *info)
 {
-       struct fb_info_control *p = (struct fb_info_control *) info;
+       struct fb_info_control *p =
+               container_of(info, struct fb_info_control, info);
        unsigned ctrl;
 
        ctrl = ld_le32(CNTRL_REG(p,ctrl));
@@ -342,7 +345,8 @@ static int controlfb_blank(int blank_mode, struct fb_info *info)
 static int controlfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                             u_int transp, struct fb_info *info)
 {
-       struct fb_info_control *p = (struct fb_info_control *) info;
+       struct fb_info_control *p =
+               container_of(info, struct fb_info_control, info);
        __u8 r, g, b;
 
        if (regno > 255)
@@ -833,7 +837,8 @@ static int control_var_to_par(struct fb_var_screeninfo *var,
        unsigned hperiod, hssync, hsblank, hesync, heblank, piped, heq, hlfln,
                 hserr, vperiod, vssync, vesync, veblank, vsblank, vswin, vewin;
        unsigned long pixclock;
-       struct fb_info_control *p = (struct fb_info_control *) fb_info;
+       struct fb_info_control *p =
+               container_of(fb_info, struct fb_info_control, info);
        struct control_regvals *r = &par->regvals;
 
        switch (var->bits_per_pixel) {