Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbbHDWAa (ORCPT ); Tue, 4 Aug 2015 18:00:30 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34940 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753409AbbHDWA0 (ORCPT ); Tue, 4 Aug 2015 18:00:26 -0400 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org, ming.lei@canonical.com 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" Subject: [PATCH 3/4] firmware: fold successful fw read early Date: Tue, 4 Aug 2015 15:00:03 -0700 Message-Id: <1438725604-22795-4-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438725604-22795-1-git-send-email-mcgrof@do-not-panic.com> References: <1438725604-22795-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1470 Lines: 51 From: David Howells We'll be folding in some more checks on fw_read_file_contents(), this will make the success case easier to follow. Signed-off-by: David Howells Signed-off-by: Luis R. Rodriguez --- drivers/base/firmware_class.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 9ee334c1b872..736fb952b75b 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -361,20 +361,18 @@ static int fw_get_filesystem_firmware(struct device *device, continue; rc = fw_read_file_contents(file, buf); fput(file); - if (rc) + if (rc == 0) { + dev_dbg(device, "system data: direct-loading firmware %s\n", + buf->fw_id); + fw_finish_direct_load(device, buf); + goto out; + } else dev_warn(device, "system data, attempted to load %s, but failed with error %d\n", path, rc); - else - break; } +out: __putname(path); - if (!rc) { - dev_dbg(device, "system data: direct-loading firmware %s\n", - buf->fw_id); - fw_finish_direct_load(device, buf); - } - return rc; } -- 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/