From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pd0-f175.google.com ([209.85.192.175]:36119 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752183AbbEMS2U (ORCPT ); Wed, 13 May 2015 14:28:20 -0400 From: "Luis R. Rodriguez" To: ming.lei@canonical.com, rusty@rustcorp.com.au Cc: torvalds@linux-foundation.org, dhowells@redhat.com, seth.forshee@canonical.com, linux-kernel@vger.kernel.org, pebolle@tiscali.nl, linux-wireless@vger.kernel.org, gregkh@linuxfoundation.org, jlee@suse.com, tiwai@suse.de, casey@schaufler-ca.com, keescook@chromium.org, mjg59@srcf.ucam.org, akpm@linux-foundation.org, "Luis R. Rodriguez" , Kyle McMartin Subject: [RFC v2 1/6] firmware: generalize reading file contents as a helper Date: Wed, 13 May 2015 11:23:51 -0700 Message-Id: <1431541436-17007-2-git-send-email-mcgrof@do-not-panic.com> (sfid-20150513_202838_170089_034DEE3B) In-Reply-To: <1431541436-17007-1-git-send-email-mcgrof@do-not-panic.com> References: <1431541436-17007-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: "Luis R. Rodriguez" We'll want to reuse this same code later in order to read two separate types of file contents. Although we can simplify fw_read_file_contents() to do a direct return we leave a bit of boilerplate code to make the next changes easier to review. In this case we'll later extend the firmware specific read to also go and fetch the signature file when required. This commit introduces no functional changes. 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 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 8c3aa3c..134dd77 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -291,7 +291,8 @@ static const char * const fw_path[] = { module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644); MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); -static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) +static int __read_file_contents(struct file *file, + void **dest_buf, size_t *dest_size) { int size; char *buf; @@ -314,14 +315,30 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) rc = security_kernel_fw_from_file(file, buf, size); if (rc) goto fail; - fw_buf->data = buf; - fw_buf->size = size; + + *dest_buf = buf; + *dest_size = size; + return 0; fail: vfree(buf); return rc; } +static int fw_read_file_contents(struct file *file, + struct firmware_buf *fw_buf) +{ + int rc; + + rc = __read_file_contents(file, + &fw_buf->data, + &fw_buf->size); + if (rc) + return rc; + + return 0; +} + static int fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf) { -- 2.3.2.209.gd67f9d5.dirty