Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1608822
| From | Ard Biesheuvel <ard.biesheuvel@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v2 3/7] efi/capsule: Clean up pr_err/info messages |
| Date | 2017-03-24 19:20 +0100 |
| Message-ID | <toBYF-5oX-83@gated-at.bofh.it> (permalink) |
| References | <toBlT-4TS-1@gated-at.bofh.it> <toBlU-4TS-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 24 March 2017 at 17:34, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> Avoid __func__, improve the information provided by some of the
> messages.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> drivers/firmware/efi/capsule-loader.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
> index 7b57dda..3fb91e1 100644
> --- a/drivers/firmware/efi/capsule-loader.c
> +++ b/drivers/firmware/efi/capsule-loader.c
> @@ -70,7 +70,7 @@ static ssize_t efi_capsule_setup_info(struct capsule_info *cap_info,
> pages_needed = ALIGN(cap_hdr->imagesize, PAGE_SIZE) >> PAGE_SHIFT;
>
> if (pages_needed == 0) {
> - pr_err("%s: pages count invalid\n", __func__);
> + pr_err("invalid capsule size");
> return -EINVAL;
> }
>
> @@ -79,8 +79,7 @@ static ssize_t efi_capsule_setup_info(struct capsule_info *cap_info,
> cap_hdr->imagesize,
> &cap_info->reset_type);
> if (ret) {
> - pr_err("%s: efi_capsule_supported() failed\n",
> - __func__);
> + pr_err("capsule not supported\n");
> return ret;
> }
>
> @@ -115,14 +114,14 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info)
> ret = efi_capsule_update(cap_hdr_temp, cap_info->pages);
> vunmap(cap_hdr_temp);
> if (ret) {
> - pr_err("%s: efi_capsule_update() failed\n", __func__);
> + pr_err("capsule update failed\n");
> return ret;
> }
>
> /* Indicate capsule binary uploading is done */
> cap_info->index = NO_FURTHER_WRITE_ACTION;
> - pr_info("%s: Successfully upload capsule file with reboot type '%s'\n",
> - __func__, !cap_info->reset_type ? "RESET_COLD" :
> + pr_info("Successfully upload capsule file with reboot type '%s'\n",
> + !cap_info->reset_type ? "RESET_COLD" :
> cap_info->reset_type == 1 ? "RESET_WARM" :
> "RESET_SHUTDOWN");
> return 0;
> @@ -207,8 +206,7 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff,
> if (cap_info->header_obtained &&
> cap_info->count >= cap_info->total_size) {
> if (cap_info->count > cap_info->total_size) {
> - pr_err("%s: upload size exceeded header defined size\n",
> - __func__);
> + pr_err("capsule upload size exceeded header defined size\n");
> ret = -EINVAL;
> goto failed;
> }
> @@ -242,7 +240,7 @@ static int efi_capsule_flush(struct file *file, fl_owner_t id)
> struct capsule_info *cap_info = file->private_data;
>
> if (cap_info->index > 0) {
> - pr_err("%s: capsule upload not complete\n", __func__);
> + pr_err("capsule upload not complete\n");
> efi_free_all_buff_pages(cap_info);
> ret = -ECANCELED;
> }
> @@ -321,8 +319,7 @@ static int __init efi_capsule_loader_init(void)
>
> ret = misc_register(&efi_capsule_misc);
> if (ret)
> - pr_err("%s: Failed to register misc char file note\n",
> - __func__);
> + pr_err("Unable to register capsule loader device\n");
>
> return ret;
> }
> --
> 2.10.2
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/7] efi: Enhance capsule loader to support signed Quark images Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
[PATCH v2 4/7] efi/capsule: Adjust return type of efi_capsule_setup_info Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 4/7] efi/capsule: Adjust return type of efi_capsule_setup_info Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-03-24 19:50 +0100
[PATCH v2 6/7] efi/capsule: Factor out overloadable efi_capsule_identify_image Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
[PATCH v2 5/7] efi/capsule: Prepare for loading images with security header Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 5/7] efi/capsule: Prepare for loading images with security header Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-03-24 21:30 +0100
[PATCH v2 3/7] efi/capsule: Clean up pr_err/info messages Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 3/7] efi/capsule: Clean up pr_err/info messages Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-03-24 19:20 +0100
[PATCH v2 2/7] efi/capsule: Remove pr_debug on ENOMEM or EFAULT Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 2/7] efi/capsule: Remove pr_debug on ENOMEM or EFAULT Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-03-24 19:20 +0100
[PATCH v2 1/7] efi/capsule: Fix return code on failing kmap/vmap Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 1/7] efi/capsule: Fix return code on failing kmap/vmap Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-03-24 19:20 +0100
[PATCH v2 7/7] efi/capsule: Add support for Quark security header Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-24 18:40 +0100
Re: [PATCH v2 7/7] efi/capsule: Add support for Quark security header Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-03-24 21:40 +0100
Re: [PATCH v2 0/7] efi: Enhance capsule loader to support signed Quark images Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-03-24 21:50 +0100
Re: [PATCH v2 0/7] efi: Enhance capsule loader to support signed Quark images Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-27 13:30 +0200
Re: [PATCH v2 0/7] efi: Enhance capsule loader to support signed Quark images Bryan O'Donoghue <pure.logic@nexus-software.ie> - 2017-03-27 12:50 +0200
Re: [PATCH v2 0/7] efi: Enhance capsule loader to support signed Quark images Jan Kiszka <jan.kiszka@siemens.com> - 2017-03-27 13:10 +0200
csiph-web