From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbdJLUDf (ORCPT ); Thu, 12 Oct 2017 16:03:35 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:50024 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbdJLUDe (ORCPT ); Thu, 12 Oct 2017 16:03:34 -0400 X-Google-Smtp-Source: AOwi7QArFoKplUF/QUcGt85FFcG2V9lrd4R9DSFxR0pFHR/85u6ju6oku7cs/8beFjETTMJ3fI9nEw== From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, jdelvare@suse.com Cc: Ard Biesheuvel Subject: [PATCH] firmware: dmi: handle missing DMI data gracefully Date: Thu, 12 Oct 2017 20:59:37 +0100 Message-Id: <20171012195937.24817-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, when booting a kernel with DMI support on a platform that has no DMI tables, the following output is emitted into the kernel log: [ 0.128818] DMI not present or invalid. ... [ 1.306659] dmi: Firmware registration failed. ... [ 2.908681] dmi-sysfs: dmi entry is absent. The first one is a pr_info(), but the subsequent ones are pr_err()s that complain about a condition that is not really an error to begin with. So let's clean this up, and give up silently if dma_available is not set. Signed-off-by: Ard Biesheuvel --- drivers/firmware/dmi-sysfs.c | 3 +++ drivers/firmware/dmi_scan.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c index d5de6ee8466d..3a264cbbb5a6 100644 --- a/drivers/firmware/dmi-sysfs.c +++ b/drivers/firmware/dmi-sysfs.c @@ -651,6 +651,9 @@ static int __init dmi_sysfs_init(void) int error; int val; + if (!dmi_available) + return 0; + if (!dmi_kobj) { pr_err("dmi-sysfs: dmi entry is absent.\n"); error = -ENODATA; diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 783041964439..17a7425063c2 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 0; /* * Set up dmi directory at /sys/firmware/dmi. This entry should stay -- 2.11.0