Re: [v2 PATCH 2/3] EDAC: Add edac_device_alloc_index()

Re: [v2 PATCH 2/3] EDAC: Add edac_device_alloc_index()

[Doug Thompson]

--- On Wed, 4/15/09, Andrew Morton <akpm@linux-foundation.org> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Subject: Re: [v2 PATCH 2/3] EDAC: Add edac_device_alloc_index()
> To: "Harry Ciao" <qingtao.cao@windriver.com>
> Cc: norsk5@yahoo.com, michael@ellerman.id.au, bluesmoke-devel@lists.sourceforge.net, linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org
> Date: Wednesday, April 15, 2009, 4:27 PM
> On Mon, 13 Apr 2009 14:05:15 +0800
> Harry Ciao <qingtao.cao@windriver.com>
> wrote:
> 
> > 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.
> > 
> 
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> keep things neat.  Also avoids having global
> identifier device_index
> shadowed by local identifier device_index.
> 
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Acked-by: Doug Thompson <dougthompson@xmission.com>

> Cc: Harry Ciao <qingtao.cao@windriver.com>
> Cc: Kumar Gala <galak@gate.crashing.org>
> Cc: Michael Ellerman <michael@ellerman.id.au>
> Cc: Paul Mackerras <paulus@samba.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/edac/edac_device.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff -puN
> drivers/edac/amd8111_edac.c~edac-add-edac_device_alloc_index-cleanup
> drivers/edac/amd8111_edac.c
> diff -puN
> drivers/edac/edac_core.h~edac-add-edac_device_alloc_index-cleanup
> drivers/edac/edac_core.h
> diff -puN
> drivers/edac/edac_device.c~edac-add-edac_device_alloc_index-cleanup
> drivers/edac/edac_device.c
> ---
> a/drivers/edac/edac_device.c~edac-add-edac_device_alloc_index-cleanup
> +++ a/drivers/edac/edac_device.c
> @@ -37,7 +37,6 @@
>   */
>  static DEFINE_MUTEX(device_ctls_mutex);
>  static LIST_HEAD(edac_device_list);
> -static atomic_t device_indexes = ATOMIC_INIT(0);
>  
>  #ifdef CONFIG_EDAC_DEBUG
>  static void edac_device_dump_device(struct
> edac_device_ctl_info *edac_dev)
> @@ -499,6 +498,8 @@ void
> edac_device_reset_delay_period(stru
>   */
>  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);
> _
> 
> 

Re: [v2 PATCH 2/3] EDAC: Add edac_device_alloc_index()

[Andrew Morton]

On Mon, 13 Apr 2009 14:05:15 +0800
Harry Ciao <qingtao.cao@windriver.com> wrote:

> 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.
> 

From: Andrew Morton <akpm@linux-foundation.org>

keep things neat.  Also avoids having global identifier device_index
shadowed by local identifier device_index.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Harry Ciao <qingtao.cao@windriver.com>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/edac/edac_device.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/edac/amd8111_edac.c~edac-add-edac_device_alloc_index-cleanup drivers/edac/amd8111_edac.c
diff -puN drivers/edac/edac_core.h~edac-add-edac_device_alloc_index-cleanup drivers/edac/edac_core.h
diff -puN drivers/edac/edac_device.c~edac-add-edac_device_alloc_index-cleanup drivers/edac/edac_device.c
--- a/drivers/edac/edac_device.c~edac-add-edac_device_alloc_index-cleanup
+++ a/drivers/edac/edac_device.c
@@ -37,7 +37,6 @@
  */
 static DEFINE_MUTEX(device_ctls_mutex);
 static LIST_HEAD(edac_device_list);
-static atomic_t device_indexes = ATOMIC_INIT(0);
 
 #ifdef CONFIG_EDAC_DEBUG
 static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev)
@@ -499,6 +498,8 @@ void edac_device_reset_delay_period(stru
  */
 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);
_

[v2 PATCH 2/3] EDAC: Add edac_device_alloc_index()

[Harry Ciao]

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.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
---
 drivers/edac/amd8111_edac.c |    3 +--
 drivers/edac/edac_core.h    |    1 +
 drivers/edac/edac_device.c  |   13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

--- 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_
 	 * 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,
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -819,6 +819,7 @@ extern void edac_device_handle_ue(struct
 				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
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -37,6 +37,7 @@
  */
 static DEFINE_MUTEX(device_ctls_mutex);
 static LIST_HEAD(edac_device_list);
+static atomic_t device_indexes = ATOMIC_INIT(0);
 
 #ifdef CONFIG_EDAC_DEBUG
 static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev)
@@ -490,6 +491,18 @@ void edac_device_reset_delay_period(stru
 	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)
+{
+	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