Skip to contentSkip to conversation

firmware: dmi_scan: avoid printing error on non-efi systems

PATCH In review Martin Hundebøll 3 participants 3 messages Feb 1, 2018 – Feb 2, 2018 Dmi/smbios support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: dmi_scan: avoid printing error on non-efi systems

dmi_init() rightfully checks if dmi is available at all, and errors out if not. This leads to harmless errors being printed during boot on non-efi systems, even when these are booted quietly.

Avoid this error-print by returning directly from dmi_init() if dmi isn't available, instead of jumping to the err-label.

---
 drivers/firmware/dmi_scan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/firmware/dmi_scan.c +2 -4
index 783041964439..86c5e0625a08 100644
@@ -715,10 +715,8 @@ static int __init dmi_init(void)
 	u8 *dmi_table;
 	int ret = -ENOMEM;
 
-	if (!dmi_available) {
-		ret = -ENODATA;
-		goto err;
-	}
+	if (!dmi_available)
+		return -ENODATA;
 
 	/*
 	 * Set up dmi directory at /sys/firmware/dmi. This entry should stay
Signature · 1 line
2.16.1
#1 lore raw

Hi Martin,

Quoted 19 lines · Martin Hundebøll

dmi_init() rightfully checks if dmi is available at all, and errors out if not. This leads to harmless errors being printed during boot on non-efi systems, even when these are booted quietly.

Avoid this error-print by returning directly from dmi_init() if dmi isn't available, instead of jumping to the err-label.

---
 drivers/firmware/dmi_scan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/firmware/dmi_scan.c +0 -0
index 783041964439..86c5e0625a08 100644
@@ -715,10 +715,8 @@ static int __init dmi_init(void)
 	u8 *dmi_table;
 	int ret = -ENOMEM;

drivers/firmware/dmi_scan.c static int __init dmi_init(void) · line 722

Quoted 10 lines
drivers/firmware/dmi_scan.c +2 -4
 
-	if (!dmi_available) {
-		ret = -ENODATA;
-		goto err;
-	}
+	if (!dmi_available)
+		return -ENODATA;
 
 	/*
 	 * Set up dmi directory at /sys/firmware/dmi. This entry should stay

I already have a similar patch by Ard Biesheuvel in my dmi tree:

http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/firmware-dmi-handle-missing-dmi-data-gracefully.patch

Does it work for you?

I'll send a pull request to Linus later today.

Thanks,

Signature · 2 lines
Jean Delvare
SUSE L3 Support
#2 lore raw

Hi,

Yeah, you can add my

Thanks,
Martin

Quoted 45 lines · Jean Delvare

Hi Martin,

Quoted 1 line · Martin Hundebøll

dmi_init() rightfully checks if dmi is available at all, and errors

out

Quoted 6 lines

if not. This leads to harmless errors being printed during boot on non-efi systems, even when these are booted quietly.

Avoid this error-print by returning directly from dmi_init() if dmi isn't available, instead of jumping to the err-label.

Review

Quoted 6 lines
---
 drivers/firmware/dmi_scan.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/drivers/firmware/dmi_scan.c

Quoted 6 lines

index 783041964439..86c5e0625a08 100644

drivers/firmware/dmi_scan.c +0 -0
@@ -715,10 +715,8 @@ static int __init dmi_init(void)
 	u8 *dmi_table;
 	int ret = -ENOMEM;

drivers/firmware/dmi_scan.c static int __init dmi_init(void) · line 722

Quoted 10 lines
drivers/firmware/dmi_scan.c +2 -4
 
-	if (!dmi_available) {
-		ret = -ENODATA;
-		goto err;
-	}
+	if (!dmi_available)
+		return -ENODATA;
 
 	/*
 	 * Set up dmi directory at /sys/firmware/dmi. This entry should

stay

I already have a similar patch by Ard Biesheuvel in my dmi tree:

http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/firmware-dmi-handle-missing-dmi-data-gracefully.patch

Does it work for you?

I'll send a pull request to Linus later today.

Thanks,

Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.