summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-05-21 19:42:56 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 16:26:31 +0900
commit8f25c01dec43ccfb0ec7d6216c1494772917a429 (patch)
tree44bc112b08d9a7074618d2eb966c2984410e289a /drivers/video
parenta707642a0653c457376068d9d4a77afe93c10c93 (diff)
downloadblackbird-op-linux-8f25c01dec43ccfb0ec7d6216c1494772917a429.tar.gz
blackbird-op-linux-8f25c01dec43ccfb0ec7d6216c1494772917a429.zip
fbdev/amifb: Remove superfluous alignment of frame buffer memory
amiga_chip_alloc() already aligns to the PAGE_SIZE Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/amifb.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 1b0185cf6868..5ea6596dd824 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2224,24 +2224,23 @@ static int amifb_ioctl(struct fb_info *info,
* Allocate, Clear and Align a Block of Chip Memory
*/
-static u_long unaligned_chipptr = 0;
+static void *aligned_chipptr;
static inline u_long __init chipalloc(u_long size)
{
- size += PAGE_SIZE-1;
- if (!(unaligned_chipptr = (u_long)amiga_chip_alloc(size,
- "amifb [RAM]"))) {
+ aligned_chipptr = amiga_chip_alloc(size, "amifb [RAM]");
+ if (!aligned_chipptr) {
pr_err("amifb: No Chip RAM for frame buffer");
return 0;
}
- memset((void *)unaligned_chipptr, 0, size);
- return PAGE_ALIGN(unaligned_chipptr);
+ memset(aligned_chipptr, 0, size);
+ return (u_long)aligned_chipptr;
}
static inline void chipfree(void)
{
- if (unaligned_chipptr)
- amiga_chip_free((void *)unaligned_chipptr);
+ if (aligned_chipptr)
+ amiga_chip_free(aligned_chipptr);
}
OpenPOWER on IntegriCloud