author: Geert Uytterhoeven <geert@linux-m68k.org> 2021-06-22 15:05:53 +0200
committer: Emil Renner Berthing <kernel@esmil.dk> 2021-09-12 14:35:03 +0200
commit: 38ecb959aaf446f451cf385697fb8d756c9eb451
parent: 7c8bb447c66b94bc6da87bbc4eb6139957f1abc9
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 6 deletions
diff --git a/drivers/video/fbdev/starfive/starfive_displayer.c b/drivers/video/fbdev/starfive/starfive_displayer.c
index 09d55c9e45fe..315a10382e5c 100644
--- a/drivers/video/fbdev/starfive/starfive_displayer.c
+++ b/drivers/video/fbdev/starfive/starfive_displayer.c
@@ -28,11 +28,6 @@
#include "starfive_fb.h"
#include "starfive_display_dev.h"
-#ifdef _ALIGN_UP
-#undef _ALIGN_UP
-#define _ALIGN_UP(addr, size) (((addr)+((size)-1))&(~((typeof(addr))(size)-1)))
-#endif
-
#define DSI_CMD_LEN(hdr) (sizeof(*hdr) + (hdr)->dlen)
static int sf_displayer_reset(struct sf_fb_data *fbi)
@@ -613,7 +608,7 @@ static int of_parse_wr_cmd(struct device_node *np,
return -EINVAL;
}
dev_cmds->n_pack = cnt;
- dev_cmds->cmds = kzalloc(_ALIGN_UP(alloc_bytes, 4), GFP_KERNEL);
+ dev_cmds->cmds = kzalloc(round_up(alloc_bytes, 4), GFP_KERNEL);
if (IS_ERR_OR_NULL(dev_cmds->cmds))
return -ENOMEM;