Merge tag 'efi-urgent-for-v5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

torvalds · torvalds · commit a46310bfae94 · 2022-03-16T11:57:46.000-07:00
Pull EFI fix from Ard Biesheuvel:
 "Avoid spurious warnings about unknown boot parameters"

* tag 'efi-urgent-for-v5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: fix return value of __setup handlers
diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c
@@ -24,7 +24,7 @@ static bool dump_properties __initdata;
 static int __init dump_properties_enable(char *arg)
 {
 	dump_properties = true;
-	return 0;
+	return 1;
 }
 
 __setup("dump_apple_properties", dump_properties_enable);
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
@@ -212,7 +212,7 @@ static int __init efivar_ssdt_setup(char *str)
 		memcpy(efivar_ssdt, str, strlen(str));
 	else
 		pr_warn("efivar_ssdt: name too long: %s\n", str);
-	return 0;
+	return 1;
 }
 __setup("efivar_ssdt=", efivar_ssdt_setup);
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ static bool dump_properties __initdata;`
`24`	`24`	`static int __init dump_properties_enable(char *arg)`
`25`	`25`	`{`
`26`	`26`	`dump_properties = true;`
`27`		`- return 0;`
	`27`	`+ return 1;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`__setup("dump_apple_properties", dump_properties_enable);`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ static int __init efivar_ssdt_setup(char *str)`
`212`	`212`	`memcpy(efivar_ssdt, str, strlen(str));`
`213`	`213`	`else`
`214`	`214`	`pr_warn("efivar_ssdt: name too long: %s\n", str);`
`215`		`- return 0;`
	`215`	`+ return 1;`
`216`	`216`	`}`
`217`	`217`	`__setup("efivar_ssdt=", efivar_ssdt_setup);`
`218`	`218`