tpm: cleanup of printk error messages

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>
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 04663cb..0cb43ef 100644 (file)
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -60,11 +60,8 @@ int tpm_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 tpm_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 12a86dd..643cc8c 100644 (file)
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -31,40 +31,29 @@ int tpm_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;
 }