diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-06-22 16:05:53 +0300 |
|---|---|---|
| committer | Emil Renner Berthing <kernel@esmil.dk> | 2021-09-12 15:35:03 +0300 |
| commit | 38ecb959aaf446f451cf385697fb8d756c9eb451 (patch) | |
| tree | 5a9484d10034456743f8680d9f73dab23da8af1a | |
| parent | 7c8bb447c66b94bc6da87bbc4eb6139957f1abc9 (diff) | |
| download | linux-38ecb959aaf446f451cf385697fb8d756c9eb451.tar.xz | |
video: fbdev: starfive: Use round_up() instead of _ALIGN_UP()
_ALIGN_UP() is being removed by commit efcec32fe84ab4ee ("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>
| -rw-r--r-- | drivers/video/fbdev/starfive/starfive_displayer.c | 7 |
1 files changed, 1 insertions, 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; |