mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Prarit Bhargava <prarit@redhat.com>,
	Ming Lei <ming.lei@canonical.com>, Borislav Petkov <bp@suse.de>,
	x86@kernel.org, amd64-microcode@amd64.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/4] firmware: Suppress fallback warnings when CONFIG_FW_LOADER_USER_HELPER=n
Date: Tue, 12 Nov 2013 13:02:16 +0100	[thread overview]
Message-ID: <1384257736-3647-5-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1384257736-3647-1-git-send-email-tiwai@suse.de>

The commit [3e358ac2bb5b: firmware: Be a bit more verbose about direct
firmware loading failure] introduced a new warning message about
falling back to user helper, but this isn't true when
CONFIG_FW_LOADER_USER_HELPER isn't set.

In this patch, clear the FW_OPT_FALLBACK flag in the case without
userhelper, so that the corresponding code will be disabled.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/base/firmware_class.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 65797742c6b6..33b87bf664ab 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -99,7 +99,11 @@ static inline long firmware_loading_timeout(void)
 /* firmware behavior options */
 #define FW_OPT_UEVENT	(1U << 0)
 #define FW_OPT_NOWAIT	(1U << 1)
+#ifdef CONFIG_FW_LOADER_USER_HELPER
 #define FW_OPT_FALLBACK	(1U << 2)
+#else
+#define FW_OPT_FALLBACK	0
+#endif
 
 struct firmware_cache {
 	/* firmware_buf instance will be added into the below list */
-- 
1.8.4.2


  parent reply	other threads:[~2013-11-12 12:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-12 12:02 [PATCH v3 0/4] Add request_firmware_direct() for microcode loader Takashi Iwai
2013-11-12 12:02 ` [PATCH v3 1/4] firmware: Introduce request_firmware_direct() Takashi Iwai
2013-11-12 12:02 ` [PATCH v3 2/4] microcode: Use request_firmware_direct() Takashi Iwai
2013-11-12 12:02 ` [PATCH v3 3/4] firmware: Use bit flags instead of boolean combos Takashi Iwai
2013-11-12 12:02 ` Takashi Iwai [this message]
2013-11-15 15:34 ` [PATCH v3 0/4] Add request_firmware_direct() for microcode loader Takashi Iwai
2013-11-15 21:24   ` Greg Kroah-Hartman
2013-11-16  9:17     ` Takashi Iwai
2013-12-02  8:44     ` Takashi Iwai
2013-12-02 14:32       ` Greg Kroah-Hartman
2013-12-02 14:35         ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384257736-3647-5-git-send-email-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=amd64-microcode@amd64.org \
    --cc=bp@suse.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ming.lei@canonical.com \
    --cc=prarit@redhat.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®