Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965601AbbLWVgF (ORCPT ); Wed, 23 Dec 2015 16:36:05 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35539 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965538AbbLWVf2 (ORCPT ); Wed, 23 Dec 2015 16:35:28 -0500 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org, ming.lei@canonical.com Cc: jwboyer@fedoraproject.org, johannes@sipsolutions.net, luto@amacapital.net, corbet@lwn.net, dwmw2@infradead.org, dhowells@redhat.com, seth.forshee@canonical.com, rusty@rustcorp.com.au, mmarek@suse.cz, mjg59@srcf.ucam.org, kyle@kernel.org, zohar@linux.vnet.ibm.com, dmitry.kasatkin@gmail.com, vgoyal@redhat.com, computersforpeace@gmail.com, keescook@chromium.org, shuahkh@osg.samsung.com, torvalds@linux-foundation.org, linux-security-module@vger.kernel.org, keyrings@linux-nfs.org, linux-kernel@vger.kernel.org, "Luis R . Rodriguez" Subject: [PATCH v3 3/5] firmware: fold successful fw read early Date: Wed, 23 Dec 2015 13:34:55 -0800 Message-Id: <1450906497-24179-4-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450906497-24179-1-git-send-email-mcgrof@do-not-panic.com> References: <1450906497-24179-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: 1451 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 d8148aa89b01..e10a5349aa61 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.6.2 -- 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/