drivers/edac: device output clenaup

The error handling output strings needed to be refactored for better
displaying of the error informaton.

Also needed to added offset_value for output as well

Signed-off-by: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 26807af2c5e73623e5e74daad2f7aba2c586a7b7..dfdfc4bbeba840e90452205fd2272e73579aefca 100644 (file)
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -158,7 +158,7 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
                        attrib_p = &dev_attrib[block * nr_attribs];
                        blk->attribs = attrib_p;
                        snprintf(blk->name, sizeof(blk->name),
-                                "%s%d", edac_block_name, block + 1);
+                                "%s%d", edac_block_name, block+offset_value);
                        blk->name[sizeof(blk->name) - 1] = '\0';
 
                        debugf1("%s() instance=%d block=%d name=%s\n",
@@ -580,7 +580,7 @@ void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,
 
        if (edac_device_get_log_ce(edac_dev))
                edac_device_printk(edac_dev, KERN_WARNING,
-                                  "CE ctl: %s, instance: %s, block: %s: %s\n",
+                                  "CE: %s instance: %s block: %s '%s'\n",
                                   edac_dev->ctl_name, instance->name,
                                   block ? block->name : "N/A", msg);
 }
@@ -626,12 +626,12 @@ void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,
 
        if (edac_device_get_log_ue(edac_dev))
                edac_device_printk(edac_dev, KERN_EMERG,
-                                  "UE ctl: %s, instance: %s, block: %s: %s\n",
+                                  "UE: %s instance: %s block: %s '%s'\n",
                                   edac_dev->ctl_name, instance->name,
                                   block ? block->name : "N/A", msg);
 
        if (edac_device_get_panic_on_ue(edac_dev))
-               panic("EDAC %s: UE instance: %s, block %s: %s\n",
+               panic("EDAC %s: UE instance: %s block %s '%s'\n",
                      edac_dev->ctl_name, instance->name,
                      block ? block->name : "N/A", msg);
 }