| Message ID | 20200116140900.26363-2-b.zolnierkie@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | video: fbdev: controlfb: small cleanup | expand |
Hi Bartlomiej On Thu, Jan 16, 2020 at 03:08:55PM +0100, Bartlomiej Zolnierkiewicz wrote: > Force le32_to_cpup() argument to be of proper type (const __le32 *). > > Also add missing inline keyword to control_par_to_var() definition > (to match function prototype). > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > --- > drivers/video/fbdev/controlfb.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c > index 38b61cdb5ca4..d7e53520a24c 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -313,7 +313,7 @@ static int controlfb_blank(int blank_mode, struct fb_info *info) > container_of(info, struct fb_info_control, info); > unsigned ctrl; > > - ctrl = le32_to_cpup(CNTRL_REG(p,ctrl)); > + ctrl = le32_to_cpup((const __force __le32 *)CNTRL_REG(p, ctrl)); Only judging from the other code in the same driver, I think a better fix would be to use: ctrl = in_le32(CNTRL_REG(p,ctrl)); ? Sam > if (blank_mode > 0) > switch (blank_mode) { > case FB_BLANK_VSYNC_SUSPEND: > @@ -952,7 +952,8 @@ static int control_var_to_par(struct fb_var_screeninfo *var, > * Convert hardware data in par to an fb_var_screeninfo > */ > > -static void control_par_to_var(struct fb_par_control *par, struct fb_var_screeninfo *var) > +static inline void control_par_to_var(struct fb_par_control *par, > + struct fb_var_screeninfo *var) > { > struct control_regints *rv; > > -- > 2.24.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c index 38b61cdb5ca4..d7e53520a24c 100644 --- a/drivers/video/fbdev/controlfb.c +++ b/drivers/video/fbdev/controlfb.c @@ -313,7 +313,7 @@ static int controlfb_blank(int blank_mode, struct fb_info *info) container_of(info, struct fb_info_control, info); unsigned ctrl; - ctrl = le32_to_cpup(CNTRL_REG(p,ctrl)); + ctrl = le32_to_cpup((const __force __le32 *)CNTRL_REG(p, ctrl)); if (blank_mode > 0) switch (blank_mode) { case FB_BLANK_VSYNC_SUSPEND: @@ -952,7 +952,8 @@ static int control_var_to_par(struct fb_var_screeninfo *var, * Convert hardware data in par to an fb_var_screeninfo */ -static void control_par_to_var(struct fb_par_control *par, struct fb_var_screeninfo *var) +static inline void control_par_to_var(struct fb_par_control *par, + struct fb_var_screeninfo *var) { struct control_regints *rv;
Force le32_to_cpup() argument to be of proper type (const __le32 *). Also add missing inline keyword to control_par_to_var() definition (to match function prototype). Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> --- drivers/video/fbdev/controlfb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)