Skip to content

Commit

Permalink
ps3fb: open-code macros that are used only once
Browse files Browse the repository at this point in the history
Open-code the X_OFF(), Y_OFF(), WIDTH(), HEIGHT(), and VP_OFF() macros, as
they're used in one place only

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Feb 6, 2008
1 parent bbcfe34 commit d9a4ba6
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/video/ps3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,8 @@ static const struct fb_videomode ps3fb_modedb[] = {
#define HEAD_A
#define HEAD_B

#define X_OFF(i) (ps3fb_res[i].xoff) /* left/right margin (pixel) */
#define Y_OFF(i) (ps3fb_res[i].yoff) /* top/bottom margin (pixel) */
#define WIDTH(i) (ps3fb_res[i].xres) /* width of FB */
#define HEIGHT(i) (ps3fb_res[i].yres) /* height of FB */
#define BPP 4 /* number of bytes per pixel */

/* Start of the virtual frame buffer (relative to fullscreen ) */
#define VP_OFF(i) ((WIDTH(i) * Y_OFF(i) + X_OFF(i)) * BPP)


static int ps3fb_mode;
module_param(ps3fb_mode, int, 0);
Expand Down Expand Up @@ -611,7 +604,10 @@ static int ps3fb_set_par(struct fb_info *info)

par->width = info->var.xres;
par->height = info->var.yres;
offset = VP_OFF(i);

/* Start of the virtual frame buffer (relative to fullscreen) */
offset = ps3fb_res[i].yoff * ddr_line_length + ps3fb_res[i].xoff * BPP;

par->fb_offset = GPU_ALIGN_UP(offset);
par->full_offset = par->fb_offset - offset;
par->pan_offset = info->var.yoffset * xdr_line_length +
Expand Down

0 comments on commit d9a4ba6

Please sign in to comment.