x86: Clean up 'sizeof x' => 'sizeof(x)'
"sizeof(x)" is the canonical coding style used in arch/x86 most of the time. Fix the few places that didn't follow the convention. (Also do some whitespace cleanups in a few places while at it.) [ mingo: Rewrote the changelog. ] Signed-off-by: Jordan Borgner <mail@jordan-borgner.de> Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20181028125828.7rgammkgzep2wpam@JordanDesktop Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:

committed by
Ingo Molnar

parent
4b783dd6a4
commit
0e96f31ea4
@@ -113,7 +113,7 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
|
||||
{
|
||||
int err;
|
||||
|
||||
memset(&cpu.flags, 0, sizeof cpu.flags);
|
||||
memset(&cpu.flags, 0, sizeof(cpu.flags));
|
||||
cpu.level = 3;
|
||||
|
||||
if (has_eflag(X86_EFLAGS_AC))
|
||||
|
@@ -50,7 +50,7 @@ static void parse_earlyprintk(void)
|
||||
int pos = 0;
|
||||
int port = 0;
|
||||
|
||||
if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) {
|
||||
if (cmdline_find_option("earlyprintk", arg, sizeof(arg)) > 0) {
|
||||
char *e;
|
||||
|
||||
if (!strncmp(arg, "serial", 6)) {
|
||||
@@ -124,7 +124,7 @@ static void parse_console_uart8250(void)
|
||||
* console=uart8250,io,0x3f8,115200n8
|
||||
* need to make sure it is last one console !
|
||||
*/
|
||||
if (cmdline_find_option("console", optstr, sizeof optstr) <= 0)
|
||||
if (cmdline_find_option("console", optstr, sizeof(optstr)) <= 0)
|
||||
return;
|
||||
|
||||
options = optstr;
|
||||
|
@@ -76,7 +76,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei)
|
||||
{
|
||||
struct biosregs ireg, oreg;
|
||||
|
||||
memset(ei, 0, sizeof *ei);
|
||||
memset(ei, 0, sizeof(*ei));
|
||||
|
||||
/* Check Extensions Present */
|
||||
|
||||
@@ -133,7 +133,7 @@ void query_edd(void)
|
||||
struct edd_info ei, *edp;
|
||||
u32 *mbrptr;
|
||||
|
||||
if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
|
||||
if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) {
|
||||
if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {
|
||||
do_edd = 1;
|
||||
do_mbr = 0;
|
||||
@@ -166,7 +166,7 @@ void query_edd(void)
|
||||
*/
|
||||
if (!get_edd_info(devno, &ei)
|
||||
&& boot_params.eddbuf_entries < EDDMAXNR) {
|
||||
memcpy(edp, &ei, sizeof ei);
|
||||
memcpy(edp, &ei, sizeof(ei));
|
||||
edp++;
|
||||
boot_params.eddbuf_entries++;
|
||||
}
|
||||
|
@@ -36,8 +36,8 @@ static void copy_boot_params(void)
|
||||
const struct old_cmdline * const oldcmd =
|
||||
(const struct old_cmdline *)OLD_CL_ADDRESS;
|
||||
|
||||
BUILD_BUG_ON(sizeof boot_params != 4096);
|
||||
memcpy(&boot_params.hdr, &hdr, sizeof hdr);
|
||||
BUILD_BUG_ON(sizeof(boot_params) != 4096);
|
||||
memcpy(&boot_params.hdr, &hdr, sizeof(hdr));
|
||||
|
||||
if (!boot_params.hdr.cmd_line_ptr &&
|
||||
oldcmd->cl_magic == OLD_CL_MAGIC) {
|
||||
|
@@ -26,7 +26,7 @@ static int detect_memory_e820(void)
|
||||
|
||||
initregs(&ireg);
|
||||
ireg.ax = 0xe820;
|
||||
ireg.cx = sizeof buf;
|
||||
ireg.cx = sizeof(buf);
|
||||
ireg.edx = SMAP;
|
||||
ireg.di = (size_t)&buf;
|
||||
|
||||
|
@@ -21,7 +21,7 @@
|
||||
|
||||
void initregs(struct biosregs *reg)
|
||||
{
|
||||
memset(reg, 0, sizeof *reg);
|
||||
memset(reg, 0, sizeof(*reg));
|
||||
reg->eflags |= X86_EFLAGS_CF;
|
||||
reg->ds = ds();
|
||||
reg->es = ds();
|
||||
|
@@ -62,7 +62,7 @@ static int vesa_probe(void)
|
||||
if (mode & ~0x1ff)
|
||||
continue;
|
||||
|
||||
memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
|
||||
memset(&vminfo, 0, sizeof(vminfo)); /* Just in case... */
|
||||
|
||||
ireg.ax = 0x4f01;
|
||||
ireg.cx = mode;
|
||||
@@ -109,7 +109,7 @@ static int vesa_set_mode(struct mode_info *mode)
|
||||
int is_graphic;
|
||||
u16 vesa_mode = mode->mode - VIDEO_FIRST_VESA;
|
||||
|
||||
memset(&vminfo, 0, sizeof vminfo); /* Just in case... */
|
||||
memset(&vminfo, 0, sizeof(vminfo)); /* Just in case... */
|
||||
|
||||
initregs(&ireg);
|
||||
ireg.ax = 0x4f01;
|
||||
@@ -241,7 +241,7 @@ void vesa_store_edid(void)
|
||||
struct biosregs ireg, oreg;
|
||||
|
||||
/* Apparently used as a nonsense token... */
|
||||
memset(&boot_params.edid_info, 0x13, sizeof boot_params.edid_info);
|
||||
memset(&boot_params.edid_info, 0x13, sizeof(boot_params.edid_info));
|
||||
|
||||
if (vginfo.version < 0x0200)
|
||||
return; /* EDID requires VBE 2.0+ */
|
||||
|
@@ -115,7 +115,7 @@ static unsigned int get_entry(void)
|
||||
} else if ((key >= '0' && key <= '9') ||
|
||||
(key >= 'A' && key <= 'Z') ||
|
||||
(key >= 'a' && key <= 'z')) {
|
||||
if (len < sizeof entry_buf) {
|
||||
if (len < sizeof(entry_buf)) {
|
||||
entry_buf[len++] = key;
|
||||
putchar(key);
|
||||
}
|
||||
|
Reference in New Issue
Block a user