Skip to content

Commit

Permalink
fbdev/amifb: Remove superfluous alignment of frame buffer memory
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Paul Mundt committed May 24, 2011
1 parent a707642 commit 8f25c01
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down

0 comments on commit 8f25c01

Please sign in to comment.