EDAC, amd64: Improve amd64-specific printing macros

Prefix the warn and error macros with the respective string so that
callers don't have to say "Error" or "Warning". We save us string length
this way in the actual calls.

While at it, shorten the calls in reserve_mc_sibling_devs().

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index df6d650a8e479393a0c3fdbde87dca5360a54367..9a7cf3c8df06e2ea6ae00f3091366a054e317008 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2528,8 +2528,7 @@ reserve_mc_sibling_devs(struct amd64_pvt *pvt, u16 pci_id1, u16 pci_id2)
        if (pvt->umc) {
                pvt->F0 = pci_get_related_function(pvt->F3->vendor, pci_id1, pvt->F3);
                if (!pvt->F0) {
-               amd64_err("error F0 device not found: vendor %x device 0x%x (broken BIOS?)\n",
-                         PCI_VENDOR_ID_AMD, pci_id1);
+                       amd64_err("F0 not found, device 0x%x (broken BIOS?)\n", pci_id1);
                        return -ENODEV;
                }
 
@@ -2538,11 +2537,10 @@ reserve_mc_sibling_devs(struct amd64_pvt *pvt, u16 pci_id1, u16 pci_id2)
                        pci_dev_put(pvt->F0);
                        pvt->F0 = NULL;
 
-               amd64_err("error F6 device not found: vendor %x device 0x%x (broken BIOS?)\n",
-                         PCI_VENDOR_ID_AMD, pci_id2);
-
+                       amd64_err("F6 not found: device 0x%x (broken BIOS?)\n", pci_id2);
                        return -ENODEV;
                }
+
                edac_dbg(1, "F0: %s\n", pci_name(pvt->F0));
                edac_dbg(1, "F3: %s\n", pci_name(pvt->F3));
                edac_dbg(1, "F6: %s\n", pci_name(pvt->F6));
@@ -2553,8 +2551,7 @@ reserve_mc_sibling_devs(struct amd64_pvt *pvt, u16 pci_id1, u16 pci_id2)
        /* Reserve the ADDRESS MAP Device */
        pvt->F1 = pci_get_related_function(pvt->F3->vendor, pci_id1, pvt->F3);
        if (!pvt->F1) {
-       amd64_err("error address map device not found: vendor %x device 0x%x (broken BIOS?)\n",
-                 PCI_VENDOR_ID_AMD, pci_id1);
+               amd64_err("F1 not found: device 0x%x (broken BIOS?)\n", pci_id1);
                return -ENODEV;
        }
 
@@ -2564,9 +2561,8 @@ reserve_mc_sibling_devs(struct amd64_pvt *pvt, u16 pci_id1, u16 pci_id2)
                pci_dev_put(pvt->F1);
                pvt->F1 = NULL;
 
-       amd64_err("error F2 device not found: vendor %x device 0x%x (broken BIOS?)\n",
-                 PCI_VENDOR_ID_AMD, pci_id2);
-                       return -ENODEV;
+               amd64_err("F2 not found: device 0x%x (broken BIOS?)\n", pci_id2);
+               return -ENODEV;
        }
 
        edac_dbg(1, "F1: %s\n", pci_name(pvt->F1));

diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index c3b004a53eea7cae5f4b2d3439264b3f3595b734..f14c24d5b1405b9445e2b7c8c4d2de9fdbe89687 100644 (file)
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -30,10 +30,10 @@
        edac_printk(KERN_NOTICE, "amd64", fmt, ##arg)
 
 #define amd64_warn(fmt, arg...) \
-       edac_printk(KERN_WARNING, "amd64", fmt, ##arg)
+       edac_printk(KERN_WARNING, "amd64", "Warning: " fmt, ##arg)
 
 #define amd64_err(fmt, arg...) \
-       edac_printk(KERN_ERR, "amd64", fmt, ##arg)
+       edac_printk(KERN_ERR, "amd64", "Error: " fmt, ##arg)
 
 #define amd64_mc_warn(mci, fmt, arg...) \
        edac_mc_chipset_printk(mci, KERN_WARNING, "amd64", fmt, ##arg)