diff options
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index e3a1730df5fd..4a76917b7cc8 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
| @@ -154,9 +154,9 @@ static void fill_fb(struct fb_info *fbi) | |||
| 154 | } | 154 | } |
| 155 | #endif | 155 | #endif |
| 156 | 156 | ||
| 157 | static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot) | 157 | static unsigned omapfb_get_vrfb_offset(const struct omapfb_info *ofbi, int rot) |
| 158 | { | 158 | { |
| 159 | struct vrfb *vrfb = &ofbi->region.vrfb; | 159 | const struct vrfb *vrfb = &ofbi->region.vrfb; |
| 160 | unsigned offset; | 160 | unsigned offset; |
| 161 | 161 | ||
| 162 | switch (rot) { | 162 | switch (rot) { |
| @@ -181,7 +181,7 @@ static unsigned omapfb_get_vrfb_offset(struct omapfb_info *ofbi, int rot) | |||
| 181 | return offset; | 181 | return offset; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot) | 184 | static u32 omapfb_get_region_rot_paddr(const struct omapfb_info *ofbi, int rot) |
| 185 | { | 185 | { |
| 186 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) { | 186 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) { |
| 187 | return ofbi->region.vrfb.paddr[rot] | 187 | return ofbi->region.vrfb.paddr[rot] |
| @@ -191,7 +191,7 @@ static u32 omapfb_get_region_rot_paddr(struct omapfb_info *ofbi, int rot) | |||
| 191 | } | 191 | } |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi) | 194 | static u32 omapfb_get_region_paddr(const struct omapfb_info *ofbi) |
| 195 | { | 195 | { |
| 196 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) | 196 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) |
| 197 | return ofbi->region.vrfb.paddr[0]; | 197 | return ofbi->region.vrfb.paddr[0]; |
| @@ -199,7 +199,7 @@ static u32 omapfb_get_region_paddr(struct omapfb_info *ofbi) | |||
| 199 | return ofbi->region.paddr; | 199 | return ofbi->region.paddr; |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | static void __iomem *omapfb_get_region_vaddr(struct omapfb_info *ofbi) | 202 | static void __iomem *omapfb_get_region_vaddr(const struct omapfb_info *ofbi) |
| 203 | { | 203 | { |
| 204 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) | 204 | if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) |
| 205 | return ofbi->region.vrfb.vaddr[0]; | 205 | return ofbi->region.vrfb.vaddr[0]; |
| @@ -780,8 +780,8 @@ static int omapfb_release(struct fb_info *fbi, int user) | |||
| 780 | return 0; | 780 | return 0; |
| 781 | } | 781 | } |
| 782 | 782 | ||
| 783 | static unsigned calc_rotation_offset_dma(struct fb_var_screeninfo *var, | 783 | static unsigned calc_rotation_offset_dma(const struct fb_var_screeninfo *var, |
| 784 | struct fb_fix_screeninfo *fix, int rotation) | 784 | const struct fb_fix_screeninfo *fix, int rotation) |
| 785 | { | 785 | { |
| 786 | unsigned offset; | 786 | unsigned offset; |
| 787 | 787 | ||
| @@ -791,8 +791,8 @@ static unsigned calc_rotation_offset_dma(struct fb_var_screeninfo *var, | |||
| 791 | return offset; | 791 | return offset; |
| 792 | } | 792 | } |
| 793 | 793 | ||
| 794 | static unsigned calc_rotation_offset_vrfb(struct fb_var_screeninfo *var, | 794 | static unsigned calc_rotation_offset_vrfb(const struct fb_var_screeninfo *var, |
| 795 | struct fb_fix_screeninfo *fix, int rotation) | 795 | const struct fb_fix_screeninfo *fix, int rotation) |
| 796 | { | 796 | { |
| 797 | unsigned offset; | 797 | unsigned offset; |
| 798 | 798 | ||
