Commit 5246c540 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>
parent 95d3af6b

drivers/edac/amd64_edac.c

+6 −10
Original line number Diff line number Diff line
@@ -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,8 +2561,7 @@ 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);

		amd64_err("F2 not found: device 0x%x (broken BIOS?)\n", pci_id2);

		return -ENODEV;

	}

drivers/edac/amd64_edac.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE