Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184884
b: refs/heads/master
c: a4c1a14
h: refs/heads/master
v: v3
  • Loading branch information
Ville Syrjälä authored and Tomi Valkeinen committed Mar 1, 2010
1 parent 767c0b6 commit 0c4d679
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2e82add832f9c95376d004d565c5e164c99b9ec
refs/heads/master: a4c1a148a0c4c690b95938e9577be9e461bc5e5a
18 changes: 9 additions & 9 deletions trunk/drivers/video/omap2/omapfb/omapfb-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ static void fill_fb(struct fb_info *fbi)
}
#endif

static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot)
static unsigned omapfb_get_vrfb_offset(const struct omapfb_info *ofbi, int rot)
{
struct vrfb *vrfb = &ofbi->region.vrfb;
const struct vrfb *vrfb = &ofbi->region.vrfb;
unsigned offset;

switch (rot) {
Expand All @@ -181,7 +181,7 @@ static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot)
return offset;
}

static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
static u32 omapfb_get_region_rot_paddr(const struct omapfb_info *ofbi, int rot)
{
if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
return ofbi->region.vrfb.paddr[rot]
Expand All @@ -191,15 +191,15 @@ static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot)
}
}

static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi)
static u32 omapfb_get_region_paddr(const struct omapfb_info *ofbi)
{
if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
return ofbi->region.vrfb.paddr[0];
else
return ofbi->region.paddr;
}

static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi)
static void __iomem *omapfb_get_region_vaddr(const struct omapfb_info *ofbi)
{
if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
return ofbi->region.vrfb.vaddr[0];
Expand Down Expand Up @@ -780,8 +780,8 @@ static int omapfb_release(struct fb_info *fbi, int user)
return 0;
}

static unsigned calc_rotation_offset_dma(struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix, int rotation)
static unsigned calc_rotation_offset_dma(const struct fb_var_screeninfo *var,
const struct fb_fix_screeninfo *fix, int rotation)
{
unsigned offset;

Expand All @@ -791,8 +791,8 @@ static unsigned calc_rotation_offset_dma(struct fb_var_screeninfo *var,
return offset;
}

static unsigned calc_rotation_offset_vrfb(struct fb_var_screeninfo *var,
struct fb_fix_screeninfo *fix, int rotation)
static unsigned calc_rotation_offset_vrfb(const struct fb_var_screeninfo *var,
const struct fb_fix_screeninfo *fix, int rotation)
{
unsigned offset;

Expand Down

0 comments on commit 0c4d679

Please sign in to comment.