From patchwork Wed May 6 00:44:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6345021 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72325BEEE1 for ; Wed, 6 May 2015 01:00:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90A452021B for ; Wed, 6 May 2015 01:00:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95AAE20138 for ; Wed, 6 May 2015 01:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755918AbbEFA7s (ORCPT ); Tue, 5 May 2015 20:59:48 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:35228 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932478AbbEFA7r (ORCPT ); Tue, 5 May 2015 20:59:47 -0400 Received: by pdbqd1 with SMTP id qd1so214177075pdb.2; Tue, 05 May 2015 17:59:46 -0700 (PDT) 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; bh=X54ARt02yfQsUDceA11m1vbzmG3F35PJBlzFsbbjOHo=; b=HKVQRaXv5woRab3VeZIIb02YoK1tq2eDh0LeexqWvbLRXeAszrrp/+VwOYmN3U/5An D51QsOajGhiLPyt3zfS9W1gO68cxwuqx13/Pt/BFQt/+R50gN/DN3mjxL4Xwc2Vr8AuH K8boEZIDMvRLhQ9KBDdv8FIbdBBlNJwSosTtcM6q/i/IWFFsytHDLP2iqdIgdu70FgqD 196VddBu2lahxR6hBiIf4yk7SurTciek9pwRq4yMPWbqyvXTIxkzBQ4bJO8YV7l1qQv8 G2PUZW2LUsyevC6LSrOnZ/ta7X+uMa7dfepPpY9DuXFWsY9jMOk182wD6O/Dy6UzKjTg Cb2g== X-Received: by 10.68.68.232 with SMTP id z8mr57069846pbt.104.1430873986895; Tue, 05 May 2015 17:59:46 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id p1sm80965pdl.60.2015.05.05.17.59.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 05 May 2015 17:59:46 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Tue, 05 May 2015 17:57:36 -0700 From: "Luis R. Rodriguez" To: rusty@rustcorp.com.au, dhowells@redhat.com, ming.lei@canonical.com, seth.forshee@canonical.com, kyle@kernel.org Cc: akpm@linux-foundation.org, gregkh@linuxfoundation.org, keescook@chromium.org, casey@schaufler-ca.com, tiwai@suse.de, mjg59@srcf.ucam.org, wireless-regdb@lists.infradead.org, linux-wireless@vger.kernel.org, jlee@suse.com, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [RFC v1 06/12] firmware: generalize "firmware" as "system data" helpers Date: Tue, 5 May 2015 17:44:24 -0700 Message-Id: <1430873070-7290-7-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430873070-7290-1-git-send-email-mcgrof@do-not-panic.com> References: <1430873070-7290-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" 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 Cc: David Howells Cc: Ming Lei Cc: Seth Forshee Cc: Kyle McMartin Signed-off-by: Luis R. Rodriguez --- drivers/base/firmware_class.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 65fcf2d..55091b4 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -346,7 +346,7 @@ 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", + dev_warn(device, "system data, attempted to load %s, but failed with error %d\n", path, rc); else break; @@ -354,7 +354,7 @@ static int fw_get_filesystem_firmware(struct device *device, __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); @@ -1063,7 +1063,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 */ }