Re: [PATCH] firmware: dmi_scan: avoid printing error on non-efi systems

From: Jean Delvare
Date: Fri Feb 02 2018 - 04:28:42 EST


Hi Martin,

On Thu, 1 Feb 2018 09:08:05 +0100, Martin HundebÃll wrote:
> 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.
>
> Signed-off-by: Martin HundebÃll <mnhu@xxxxxxxxx>
> ---
> drivers/firmware/dmi_scan.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
> index 783041964439..86c5e0625a08 100644
> --- a/drivers/firmware/dmi_scan.c
> +++ b/drivers/firmware/dmi_scan.c
> @@ -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

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,
--
Jean Delvare
SUSE L3 Support