mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 21:30:43 +00:00
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:
parent
a707642a06
commit
8f25c01dec
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user