diff options
author | Robert Richter <robert.richter@linaro.org> | 2013-10-10 12:22:36 -0400 |
---|---|---|
committer | Robert Richter <rric@kernel.org> | 2013-11-04 18:01:09 -0500 |
commit | 7270a6085a20a9c6aecb0be8c70510702118dc71 (patch) | |
tree | dd44024ed22c319791288f6f229eff9e8f9ce001 | |
parent | 41ec0e8da05267120c99bd4f66277939fad81a07 (diff) |
edac: Unify reporting of device info for device, mc and pci
Log messages slightly differ between edac subsystems. Unifying it.
Signed-off-by: Robert Richter <robert.richter@linaro.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Robert Richter <rric@kernel.org>
-rw-r--r-- | drivers/edac/edac_device.c | 9 | ||||
-rw-r--r-- | drivers/edac/edac_mc.c | 6 | ||||
-rw-r--r-- | drivers/edac/edac_pci.c | 8 |
3 files changed, 10 insertions, 13 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 211021dfec73..102674346035 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
@@ -530,12 +530,9 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev) | |||
530 | 530 | ||
531 | /* Report action taken */ | 531 | /* Report action taken */ |
532 | edac_device_printk(edac_dev, KERN_INFO, | 532 | edac_device_printk(edac_dev, KERN_INFO, |
533 | "Giving out device to module '%s' controller " | 533 | "Giving out device to module %s controller %s: DEV %s (%s)\n", |
534 | "'%s': DEV '%s' (%s)\n", | 534 | edac_dev->mod_name, edac_dev->ctl_name, edac_dev->dev_name, |
535 | edac_dev->mod_name, | 535 | edac_op_state_to_string(edac_dev->op_state)); |
536 | edac_dev->ctl_name, | ||
537 | edac_dev_name(edac_dev), | ||
538 | edac_op_state_to_string(edac_dev->op_state)); | ||
539 | 536 | ||
540 | mutex_unlock(&device_ctls_mutex); | 537 | mutex_unlock(&device_ctls_mutex); |
541 | return 0; | 538 | return 0; |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 89e109022d78..e8c9ef03495b 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -788,8 +788,10 @@ int edac_mc_add_mc(struct mem_ctl_info *mci) | |||
788 | } | 788 | } |
789 | 789 | ||
790 | /* Report action taken */ | 790 | /* Report action taken */ |
791 | edac_mc_printk(mci, KERN_INFO, "Giving out device to '%s' '%s':" | 791 | edac_mc_printk(mci, KERN_INFO, |
792 | " DEV %s\n", mci->mod_name, mci->ctl_name, edac_dev_name(mci)); | 792 | "Giving out device to module %s controller %s: DEV %s (%s)\n", |
793 | mci->mod_name, mci->ctl_name, mci->dev_name, | ||
794 | edac_op_state_to_string(mci->op_state)); | ||
793 | 795 | ||
794 | edac_mc_owner = mci->mod_name; | 796 | edac_mc_owner = mci->mod_name; |
795 | 797 | ||
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index dd370f92ace3..2cf44b4db80c 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -358,11 +358,9 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx) | |||
358 | } | 358 | } |
359 | 359 | ||
360 | edac_pci_printk(pci, KERN_INFO, | 360 | edac_pci_printk(pci, KERN_INFO, |
361 | "Giving out device to module '%s' controller '%s':" | 361 | "Giving out device to module %s controller %s: DEV %s (%s)\n", |
362 | " DEV '%s' (%s)\n", | 362 | pci->mod_name, pci->ctl_name, pci->dev_name, |
363 | pci->mod_name, | 363 | edac_op_state_to_string(pci->op_state)); |
364 | pci->ctl_name, | ||
365 | edac_dev_name(pci), edac_op_state_to_string(pci->op_state)); | ||
366 | 364 | ||
367 | mutex_unlock(&edac_pci_ctls_mutex); | 365 | mutex_unlock(&edac_pci_ctls_mutex); |
368 | return 0; | 366 | return 0; |