UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/earlycon: Replace open coded strnchrnul() 

strnchrnul() can be called in the early stages. Replace
open coded variant in the EFI early console driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Andy Shevchenko 2022-12-09 00:12:16 +02:00 committed by Ard Biesheuvel
parent 1b929c02af
commit b7a1cd2438
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/firmware/efi/earlycon.c
View File

@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/serial_core.h>
#include <linux/screen_info.h>
#include <linux/string.h>
#include <asm/early_ioremap.h>
@ -143,16 +144,10 @@ efi_earlycon_write(struct console *con, const char *str, unsigned int num)
len = si->lfb_linelength;
while (num) {
unsigned int linemax;
unsigned int h, count = 0;
unsigned int linemax = (si->lfb_width - efi_x) / font->width;
unsigned int h, count;
for (s = str; *s && *s != '\n'; s++) {
if (count == num)
break;
count++;
}
linemax = (si->lfb_width - efi_x) / font->width;
count = strnchrnul(str, num, '\n') - str;
if (count > linemax)
count = linemax;