Commit eba77c04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_updates_for_v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC updates from Borislav Petkov:

 - Have skx_edac decode error addresses belonging to SGX properly

 - Remove a bunch of unused struct members

 - Other cleanups

* tag 'edac_updates_for_v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/skx_common: Allow decoding of SGX addresses
  EDAC/mc_sysfs: Convert sprintf()/snprintf() to sysfs_emit()
  EDAC: Remove unused struct members
  EDAC: Remove dynamic attributes from edac_device_alloc_ctl_info()
  EDAC/device: Remove edac_dev_sysfs_block_attribute::store()
  EDAC/device: Remove edac_dev_sysfs_block_attribute::{block,value}
  EDAC/amd64: Remove unused struct member amd64_pvt::ext_nbcfg
parents 796aec4a e0d33507

drivers/edac/altera_edac.c

+3 −5
Original line number Diff line number Diff line
@@ -737,8 +737,7 @@ static int altr_edac_device_probe(struct platform_device *pdev) 
	}



	dci = edac_device_alloc_ctl_info(sizeof(*drvdata), ecc_name,

					 1, ecc_name, 1, 0, NULL, 0,

					 dev_instance++);

					 1, ecc_name, 1, 0, dev_instance++);



	if (!dci) {

		edac_printk(KERN_ERR, EDAC_DEVICE,
@@ -1514,7 +1513,7 @@ static int altr_portb_setup(struct altr_edac_device_dev *device) 
	/* Create the PortB EDAC device */

	edac_idx = edac_device_alloc_index();

	dci = edac_device_alloc_ctl_info(sizeof(*altdev), ecc_name, 1,

					 ecc_name, 1, 0, NULL, 0, edac_idx);

					 ecc_name, 1, 0, edac_idx);

	if (!dci) {

		edac_printk(KERN_ERR, EDAC_DEVICE,

			    "%s: Unable to allocate PortB EDAC device\n",
@@ -1921,8 +1920,7 @@ static int altr_edac_a10_device_add(struct altr_arria10_edac *edac, 


	edac_idx = edac_device_alloc_index();

	dci = edac_device_alloc_ctl_info(sizeof(*altdev), ecc_name,

					 1, ecc_name, 1, 0, NULL, 0,

					 edac_idx);

					 1, ecc_name, 1, 0, edac_idx);



	if (!dci) {

		edac_printk(KERN_ERR, EDAC_DEVICE,

drivers/edac/amd64_edac.h

+0 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ struct amd64_pvt { 
	u32 dchr1;		/* DRAM Configuration High DCT1 reg */

	u32 nbcap;		/* North Bridge Capabilities */

	u32 nbcfg;		/* F10 North Bridge Configuration */

	u32 ext_nbcfg;		/* Extended F10 North Bridge Configuration */

	u32 dhar;		/* DRAM Hoist reg */

	u32 dbam0;		/* DRAM Base Address Mapping reg for DCT0 */

	u32 dbam1;		/* DRAM Base Address Mapping reg for DCT1 */

drivers/edac/amd8111_edac.c

+1 −2
Original line number Diff line number Diff line
@@ -366,8 +366,7 @@ static int amd8111_dev_probe(struct pci_dev *dev, 
	dev_info->edac_idx = edac_device_alloc_index();

	dev_info->edac_dev =

		edac_device_alloc_ctl_info(0, dev_info->ctl_name, 1,

					   NULL, 0, 0,

					   NULL, 0, dev_info->edac_idx);

					   NULL, 0, 0, dev_info->edac_idx);

	if (!dev_info->edac_dev) {

		ret = -ENOMEM;

		goto err_dev_put;

drivers/edac/armada_xp_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int aurora_l2_probe(struct platform_device *pdev) 
		dev_warn(&pdev->dev, "data ECC is not enabled\n");



	dci = edac_device_alloc_ctl_info(sizeof(*drvdata),

					 "cpu", 1, "L", 1, 2, NULL, 0, 0);

					 "cpu", 1, "L", 1, 2, 0);

	if (!dci)

		return -ENOMEM;

drivers/edac/cpc925_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static void cpc925_add_edac_devices(void __iomem *vbase) 
		dev_info->edac_idx = edac_device_alloc_index();

		dev_info->edac_dev =

			edac_device_alloc_ctl_info(0, dev_info->ctl_name,

				1, NULL, 0, 0, NULL, 0, dev_info->edac_idx);

				1, NULL, 0, 0, dev_info->edac_idx);

		if (!dev_info->edac_dev) {

			cpc925_printk(KERN_ERR, "No memory for edac device\n");

			goto err1;