dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Geert Uytterhoeven 2011-05-21 19:42:56 +00:00 committed by Paul Mundt
parent a707642a06
commit 8f25c01dec
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/amifb.c
View File

@ -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);
}