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.

[[email protected]: cleanups]
Signed-off-by: Harry Ciao <[email protected]>
Cc: Doug Thompson <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Kumar Gala <[email protected]>
Cc: Paul Mackerras <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 2cb58ef743e03b79cc2e9d35460699f644e69d56..35b78d04bbfa589682efcdc744a7e4db2300ccaa 100644 (file)
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -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,

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 48d3b1409834e90e705608934ec8f399974b475a..3493c6bdb8206b7f712c00cf07b355974bdd27a2 100644 (file)
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -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

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index a7d2c717d0338582339ce23198b0a440dc1299e4..b02a6a69a8f0148eebbaa19526a75e89890973d9 100644 (file)
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -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