Commit d391a7b8147d12b0e5141fb65829856fb0c289dc

Authored by Douglas Thompson
Committed by Linus Torvalds
1 parent 42a8e397a8

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>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/edac/edac_device.c
... ... @@ -158,7 +158,7 @@
158 158 attrib_p = &dev_attrib[block * nr_attribs];
159 159 blk->attribs = attrib_p;
160 160 snprintf(blk->name, sizeof(blk->name),
161   - "%s%d", edac_block_name, block + 1);
  161 + "%s%d", edac_block_name, block+offset_value);
162 162 blk->name[sizeof(blk->name) - 1] = '\0';
163 163  
164 164 debugf1("%s() instance=%d block=%d name=%s\n",
... ... @@ -580,7 +580,7 @@
580 580  
581 581 if (edac_device_get_log_ce(edac_dev))
582 582 edac_device_printk(edac_dev, KERN_WARNING,
583   - "CE ctl: %s, instance: %s, block: %s: %s\n",
  583 + "CE: %s instance: %s block: %s '%s'\n",
584 584 edac_dev->ctl_name, instance->name,
585 585 block ? block->name : "N/A", msg);
586 586 }
587 587  
... ... @@ -626,12 +626,12 @@
626 626  
627 627 if (edac_device_get_log_ue(edac_dev))
628 628 edac_device_printk(edac_dev, KERN_EMERG,
629   - "UE ctl: %s, instance: %s, block: %s: %s\n",
  629 + "UE: %s instance: %s block: %s '%s'\n",
630 630 edac_dev->ctl_name, instance->name,
631 631 block ? block->name : "N/A", msg);
632 632  
633 633 if (edac_device_get_panic_on_ue(edac_dev))
634   - panic("EDAC %s: UE instance: %s, block %s: %s\n",
  634 + panic("EDAC %s: UE instance: %s block %s '%s'\n",
635 635 edac_dev->ctl_name, instance->name,
636 636 block ? block->name : "N/A", msg);
637 637 }