GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-17 20:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

video: fbdev: starfive: Use round_up() instead of _ALIGN_UP()

Browse source 
_ALIGN_UP() is being removed by commit efcec32fe8 ("riscv: Cleanup
unused functions") in riscv/for-next:

    drivers/video/fbdev/starfive/starfive_displayer.c: In function ‘of_parse_wr_cmd’:
    drivers/video/fbdev/starfive/starfive_displayer.c:616:27: error: implicit declaration of function ‘_ALIGN_UP’ [-Werror=implic
    it-function-declaration]
      616 |  dev_cmds->cmds = kzalloc(_ALIGN_UP(alloc_bytes, 4), GFP_KERNEL);
	  |                           ^~~~~~~~~

Just use roundup() instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Emil Renner Berthing <kernel@esmil.dk>
This commit is contained in:
Geert Uytterhoeven 2021-06-22 15:05:53 +02:00 • committed by Emil Renner Berthing
parent 585a2ab3d2
commit 1aaa011e7e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/starfive/starfive_displayer.c
View file

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