Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1200292 > unrolled thread
| Started by | "Luis R. Rodriguez" <mcgrof@do-not-panic.com> |
|---|---|
| First post | 2015-08-05 00:10 +0200 |
| Last post | 2015-08-10 18:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 3/4] firmware: fold successful fw read early "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-05 00:10 +0200
Re: [PATCH 3/4] firmware: fold successful fw read early Ming Lei <ming.lei@canonical.com> - 2015-08-09 15:40 +0200
Re: [PATCH 3/4] firmware: fold successful fw read early "Luis R. Rodriguez" <mcgrof@do-not-panic.com> - 2015-08-10 18:50 +0200
| From | "Luis R. Rodriguez" <mcgrof@do-not-panic.com> |
|---|---|
| Date | 2015-08-05 00:10 +0200 |
| Subject | [PATCH 3/4] firmware: fold successful fw read early |
| Message-ID | <pTSzg-70T-11@gated-at.bofh.it> |
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;
+ } 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/
[toc] | [next] | [standalone]
| From | Ming Lei <ming.lei@canonical.com> |
|---|---|
| Date | 2015-08-09 15:40 +0200 |
| Message-ID | <pVyZs-7vr-19@gated-at.bofh.it> |
| In reply to | #1200292 |
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.
> + } 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/
[toc] | [prev] | [next] | [standalone]
| From | "Luis R. Rodriguez" <mcgrof@do-not-panic.com> |
|---|---|
| Date | 2015-08-10 18:50 +0200 |
| Message-ID | <pVYqR-3yH-19@gated-at.bofh.it> |
| In reply to | #1203640 |
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
--
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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web