From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754703AbbHJQoB (ORCPT <rfc822;w@1wt.eu>);
	Mon, 10 Aug 2015 12:44:01 -0400
Received: from mail-ob0-f172.google.com ([209.85.214.172]:34075 "EHLO
	mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751912AbbHJQn4 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 10 Aug 2015 12:43:56 -0400
MIME-Version: 1.0
In-Reply-To: <CACVXFVPT0JfUqH6fPTU+km4=KtSjcA8=zk+gsGv+oR6ee01FLg@mail.gmail.com>
References: <1438725604-22795-1-git-send-email-mcgrof@do-not-panic.com>
 <1438725604-22795-4-git-send-email-mcgrof@do-not-panic.com> <CACVXFVPT0JfUqH6fPTU+km4=KtSjcA8=zk+gsGv+oR6ee01FLg@mail.gmail.com>
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Date: Mon, 10 Aug 2015 09:43:36 -0700
X-Google-Sender-Auth: YIgnUi7qXSv9CFKTuhKYbdSO9wo
Message-ID: <CAB=NE6UB0=HiN8vadNpmDCoPa_c6-nApbYcjUZxa_Q3GfTPVog@mail.gmail.com>
Subject: Re: [PATCH 3/4] firmware: fold successful fw read early
To: Ming Lei <ming.lei@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>,
        David Woodhouse <dwmw2@infradead.org>,
        David Howells <dhowells@redhat.com>,
        Seth Forshee <seth.forshee@canonical.com>,
        Rusty Russell <rusty@rustcorp.com.au>, Michal Marek <mmarek@suse.cz>,
        Matthew Garrett <mjg59@srcf.ucam.org>, Kyle McMartin <kyle@kernel.org>,
        linux-security-module <linux-security-module@vger.kernel.org>,
        keyrings@linux-nfs.org
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Aug 9, 2015 at 6:29 AM, Ming Lei <ming.lei@canonical.com> wrote:
> On Tue, Aug 4, 2015 at 6:00 PM, Luis R. Rodriguez
> <mcgrof@do-not-panic.com> wrote:
>> From: David Howells <dhowells@redhat.com>
>>
>> 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 <dhowells@redhat.com>
>> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
>> ---
>>  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;
>
> 'break' should be enough, and the following 'out' label can be saved too.

This is true but I left it as it makes the next patch easier to read and follow.

>> +               } else
>>                         dev_warn(device, "system data, attempted to load %s, but failed with error %d\n",
>>                                  path, rc);
>> -               else
>> -                       break;
>>         }
>> +out:
>>         __putname(path);

  Luis