Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc9b70d authored by Harry Ciao's avatar Harry Ciao Committed by Linus Torvalds
Browse files

edac: add edac_device_alloc_index() 



Add edac_device_alloc_index(), because for MAPLE platform there may
exist several EDAC driver modules that could make use of
edac_device_ctl_info structure at the same time. The index allocation
for these structures should be taken care of by EDAC core.

[akpm@linux-foundation.org: cleanups]
Signed-off-by: default avatarHarry Ciao <qingtao.cao@windriver.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2a9036af

drivers/edac/amd8111_edac.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define AMD8111_EDAC_MOD_STR	"amd8111_edac"



#define PCI_DEVICE_ID_AMD_8111_PCI	0x7460

static int edac_dev_idx;



enum amd8111_edac_devs {

	LPC_BRIDGE = 0,
@@ -377,7 +376,7 @@ static int amd8111_dev_probe(struct pci_dev *dev, 
	 * edac_device_ctl_info, but make use of existing

	 * one instead.

	*/

	dev_info->edac_idx = edac_dev_idx++;

	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,

drivers/edac/edac_core.h

+1 −0
Original line number Diff line number Diff line
@@ -841,6 +841,7 @@ extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev, 
				int inst_nr, int block_nr, const char *msg);

extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev,

				int inst_nr, int block_nr, const char *msg);

extern int edac_device_alloc_index(void);



/*

 * edac_pci APIs

drivers/edac/edac_device.c

+14 −0
Original line number Diff line number Diff line
@@ -490,6 +490,20 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev, 
	mutex_unlock(&device_ctls_mutex);

}



/*

 * edac_device_alloc_index: Allocate a unique device index number

 *

 * Return:

 *	allocated index number

 */

int edac_device_alloc_index(void)

{

	static atomic_t device_indexes = ATOMIC_INIT(0);



	return atomic_inc_return(&device_indexes) - 1;

}

EXPORT_SYMBOL_GPL(edac_device_alloc_index);



/**

 * edac_device_add_device: Insert the 'edac_dev' structure into the

 * edac_device global list and create sysfs entries associated with