Groups > linux.kernel > #1200298

[PATCH 1/4] firmware: generalize "firmware" as "system data" helpers

Path	csiph.com!optima2.xanadu-bbs.net!xanadu-bbs.net!goblin3!goblin1!goblin.stu.neva.ru!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/4] firmware: generalize "firmware" as "system data" helpers
Date	Wed, 05 Aug 2015 00:10:03 +0200
Message-ID	<pTSzh-70T-41@gated-at.bofh.it> (permalink)
References	<pTSzg-70T-9@gated-at.bofh.it>
X-Original-To	gregkh@linuxfoundation.org, ming.lei@canonical.com
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=v6IArawULu1f2iH46lUWw9Ip/gQfruN1sFXVuy2qxPQ=; b=zzGQNX4bHQlQ1FS1rSmBowuHRaJ0aUFp7pcflIw7BwzNbKuHoBgigBYgU0j7QkcXv/ 3RRYd4LbpxOcyFFf0UCgHEKRz6eBdBJRXxz8vHHFgFSYEkL3xqSJiBMTk12pGr54F4P4 Hw9xjUpWsI6SAazMF1m4sMM+JyYobNStzgrB3OygtvT3utOZnvYYMiGqYo4ikK2hIsnu zEP6zALmHEXWZeqUAn3o5+SIxvEkkSOjy6pXnLwh4Kq9Hm5pIgR/ArcfvW7omH9JNoa8 AHBJP1CIo7loDvnMPK9rpnuIUx8uosjpC/+8i+13cSD4jDP/2LN7aBUUDlYd68ujcZWg 9qig==
X-Received	by 10.66.101.71 with SMTP id fe7mr12269266pab.89.1438725618940; Tue, 04 Aug 2015 15:00:18 -0700 (PDT)
X-Mailer	git-send-email 2.1.4
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Content-Transfer-Encoding	8bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	68
Organization	linux.* mail to news gateway
X-Original-Cc	corbet@lwn.net, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, dwmw2@infradead.org, dhowells@redhat.com, seth.forshee@canonical.com, rusty@rustcorp.com.au, mmarek@suse.cz, mjg59@srcf.ucam.org, kyle@kernel.org, linux-security-module@vger.kernel.org, keyrings@linux-nfs.org, "Luis R. Rodriguez" <mcgrof@suse.com>, Andrew Morton <akpm@linux-foundation.org>, Kees Cook <keescook@chromium.org>, Casey Schaufler <casey@schaufler-ca.com>, Takashi Iwai <tiwai@suse.de>, Vojtěch Pavlík <vojtech@suse.cz>
X-Original-Date	Tue, 4 Aug 2015 15:00:01 -0700
X-Original-Message-ID	<1438725604-22795-2-git-send-email-mcgrof@do-not-panic.com>
X-Original-References	<1438725604-22795-1-git-send-email-mcgrof@do-not-panic.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1200298

Show key headers only | View raw

From: "Luis R. Rodriguez" <mcgrof@suse.com>

Historically firmware_class code was added to help
get device driver firmware binaries but these days
request_firmware*() helpers are being repurposed for
general system data needed by the kernel.

Annotate this before we extend firmare_class more,
as this is expected. We want to generalize the code
as much as possible.

Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Vojtěch Pavlík <vojtech@suse.cz>
Cc: Kyle McMartin <kyle@kernel.org>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
 drivers/base/firmware_class.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 894bda114224..f97e76cca069 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device *device,
 		rc = fw_read_file_contents(file, buf);
 		fput(file);
 		if (rc)
-			dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n",
-				path, rc);
+			dev_warn(device, "system data, attempted to load %s, but failed with error %d\n",
+				 path, rc);
 		else
 			break;
 	}
 	__putname(path);
 
 	if (!rc) {
-		dev_dbg(device, "firmware: direct-loading firmware %s\n",
+		dev_dbg(device, "system data: direct-loading firmware %s\n",
 			buf->fw_id);
 		mutex_lock(&fw_lock);
 		set_bit(FW_STATUS_DONE, &buf->status);
@@ -1051,7 +1051,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name,
 	}
 
 	if (fw_get_builtin_firmware(firmware, name)) {
-		dev_dbg(device, "firmware: using built-in firmware %s\n", name);
+		dev_dbg(device, "system data: using built-in system data%s\n", name);
 		return 0; /* assigned */
 	}
 
-- 
2.3.2.209.gd67f9d5.dirty

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] firmware_class: few small code shifts "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-05 00:10 +0200
  [PATCH 2/4] firmware: move completing fw into a helper "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-05 00:10 +0200
  [PATCH 4/4] firmware: generalize reading file contents as a helper "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-05 00:10 +0200
  [PATCH 1/4] firmware: generalize "firmware" as "system data" helpers "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-05 00:10 +0200

csiph-web