Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1522132
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v6 9/9] tpm: cleanup of printk error messages |
| Date | 2016-11-14 23:30 +0100 |
| Message-ID | <sDxVf-4Bm-7@gated-at.bofh.it> (permalink) |
| References | <sDmn7-5BA-3@gated-at.bofh.it> <sDmn8-5BA-23@gated-at.bofh.it> |
| Organization | Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo |
On Mon, Nov 14, 2016 at 05:00:56AM -0500, Nayna Jain wrote:
> This patch removes the unnecessary error messages on failing to
> allocate memory and replaces pr_err/printk with dev_dbg/dev_info
> as applicable.
>
> Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm_acpi.c | 16 ++++------------
> drivers/char/tpm/tpm_of.c | 29 +++++++++--------------------
> 2 files changed, 13 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
> index fa30c969..ddbaef2 100644
> --- a/drivers/char/tpm/tpm_acpi.c
> +++ b/drivers/char/tpm/tpm_acpi.c
> @@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
> status = acpi_get_table(ACPI_SIG_TCPA, 1,
> (struct acpi_table_header **)&buff);
>
> - if (ACPI_FAILURE(status)) {
> - printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
> - __func__);
> + if (ACPI_FAILURE(status))
> return -EIO;
> - }
>
> switch(buff->platform_class) {
> case BIOS_SERVER:
> @@ -78,25 +75,20 @@ int read_log_acpi(struct tpm_chip *chip)
> break;
> }
> if (!len) {
> - printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
> + dev_warn(&chip->dev, "%s: TCPA log area empty\n", __func__);
> return -EIO;
> }
>
> /* malloc EventLog space */
> log->bios_event_log = kmalloc(len, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - printk("%s: ERROR - Not enough Memory for BIOS measurements\n",
> - __func__);
> + if (!log->bios_event_log)
> return -ENOMEM;
> - }
>
> log->bios_event_log_end = log->bios_event_log + len;
>
> virt = acpi_os_map_iomem(start, len);
> - if (!virt) {
> - printk("%s: ERROR - Unable to map memory\n", __func__);
> + if (!virt)
> goto err;
> - }
>
> memcpy_fromio(log->bios_event_log, virt, len);
>
> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> index 22b8f81..3af829f 100644
> --- a/drivers/char/tpm/tpm_of.c
> +++ b/drivers/char/tpm/tpm_of.c
> @@ -31,40 +31,29 @@ int read_log_of(struct tpm_chip *chip)
> log = &chip->log;
> if (chip->dev.parent->of_node)
> np = chip->dev.parent->of_node;
> - if (!np) {
> - pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
> + if (!np)
> return -ENODEV;
> - }
>
> sizep = of_get_property(np, "linux,sml-size", NULL);
> - if (sizep == NULL) {
> - pr_err("%s: ERROR - SML size not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (sizep == NULL)
> + return -EIO;
> +
> if (*sizep == 0) {
> - pr_err("%s: ERROR - event log area empty\n", __func__);
> - goto cleanup_eio;
> + dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);
> + return -EIO;
> }
>
> basep = of_get_property(np, "linux,sml-base", NULL);
> - if (basep == NULL) {
> - pr_err("%s: ERROR - SML not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (basep == NULL)
> + return -EIO;
>
> log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
> - __func__);
> + if (!log->bios_event_log)
> return -ENOMEM;
> - }
>
> log->bios_event_log_end = log->bios_event_log + *sizep;
>
> memcpy(log->bios_event_log, __va(*basep), *sizep);
>
> return 0;
> -
> -cleanup_eio:
> - return -EIO;
> }
> --
> 2.5.0
>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
[PATCH v6 9/9] tpm: cleanup of printk error messages Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 9/9] tpm: cleanup of printk error messages Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [PATCH v6 9/9] tpm: cleanup of printk error messages Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:20 +0100
Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-22 12:30 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-22 17:50 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna <nayna@linux.vnet.ibm.com> - 2016-11-24 04:20 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-24 13:00 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-24 13:00 +0100
[PATCH v6 5/9] tpm: have event log use the tpm_chip Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 00:50 +0100
Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 1/9] tpm: define a generic open() method for ascii & bios measurements Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:30 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 03:20 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna <nayna@linux.vnet.ibm.com> - 2016-11-15 06:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 18:50 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-15 19:10 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 20:00 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-19 19:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-20 11:00 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-21 19:30 +0100
csiph-web