Patched in Tegra support.

1 files changed, 45 insertions, 36 deletions

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 211021dfec7..c3f67437afb 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -23,6 +23,7 @@
 #include <linux/jiffies.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sysdev.h>
 #include <linux/ctype.h>
 #include <linux/workqueue.h>
 #include <asm/uaccess.h>
@@ -40,13 +41,12 @@ static LIST_HEAD(edac_device_list);
 #ifdef CONFIG_EDAC_DEBUG
 static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev)
 {
-        edac_dbg(3, "\tedac_dev = %p dev_idx=%d\n",
-                 edac_dev, edac_dev->dev_idx);
-        edac_dbg(4, "\tedac_dev->edac_check = %p\n", edac_dev->edac_check);
-        edac_dbg(3, "\tdev = %p\n", edac_dev->dev);
-        edac_dbg(3, "\tmod_name:ctl_name = %s:%s\n",
-                 edac_dev->mod_name, edac_dev->ctl_name);
-        edac_dbg(3, "\tpvt_info = %p\n\n", edac_dev->pvt_info);
+        debugf3("\tedac_dev = %p dev_idx=%d \n", edac_dev, edac_dev->dev_idx);
+        debugf4("\tedac_dev->edac_check = %p\n", edac_dev->edac_check);
+        debugf3("\tdev = %p\n", edac_dev->dev);
+        debugf3("\tmod_name:ctl_name = %s:%s\n",
+                edac_dev->mod_name, edac_dev->ctl_name);
+        debugf3("\tpvt_info = %p\n\n", edac_dev->pvt_info);
 }
 #endif                          /* CONFIG_EDAC_DEBUG */
 
@@ -57,7 +57,7 @@ static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev)
  *
  *      The control structure is allocated in complete chunk
  *      from the OS. It is in turn sub allocated to the
- *      various objects that compose the structure
+ *      various objects that compose the struture
  *
  *      The structure has a 'nr_instance' array within itself.
  *      Each instance represents a major component
@@ -80,10 +80,11 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
         unsigned total_size;
         unsigned count;
         unsigned instance, block, attr;
-        void *pvt, *p;
+        void *pvt;
         int err;
 
-        edac_dbg(4, "instances=%d blocks=%d\n", nr_instances, nr_blocks);
+        debugf4("%s() instances=%d blocks=%d\n",
+                __func__, nr_instances, nr_blocks);
 
         /* Calculate the size of memory we need to allocate AND
          * determine the offsets of the various item arrays
@@ -92,30 +93,35 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
          * to be at least as stringent as what the compiler would
          * provide if we could simply hardcode everything into a single struct.
          */
-        p = NULL;
-        dev_ctl = edac_align_ptr(&p, sizeof(*dev_ctl), 1);
+        dev_ctl = (struct edac_device_ctl_info *)NULL;
 
         /* Calc the 'end' offset past end of ONE ctl_info structure
          * which will become the start of the 'instance' array
          */
-        dev_inst = edac_align_ptr(&p, sizeof(*dev_inst), nr_instances);
+        dev_inst = edac_align_ptr(&dev_ctl[1], sizeof(*dev_inst));
 
         /* Calc the 'end' offset past the instance array within the ctl_info
          * which will become the start of the block array
          */
-        count = nr_instances * nr_blocks;
-        dev_blk = edac_align_ptr(&p, sizeof(*dev_blk), count);
+        dev_blk = edac_align_ptr(&dev_inst[nr_instances], sizeof(*dev_blk));
 
         /* Calc the 'end' offset past the dev_blk array
          * which will become the start of the attrib array, if any.
          */
-        /* calc how many nr_attrib we need */
-        if (nr_attrib > 0)
+        count = nr_instances * nr_blocks;
+        dev_attrib = edac_align_ptr(&dev_blk[count], sizeof(*dev_attrib));
+
+        /* Check for case of when an attribute array is specified */
+        if (nr_attrib > 0) {
+                /* calc how many nr_attrib we need */
                 count *= nr_attrib;
-        dev_attrib = edac_align_ptr(&p, sizeof(*dev_attrib), count);
 
-        /* Calc the 'end' offset past the attributes array */
-        pvt = edac_align_ptr(&p, sz_private, 1);
+                /* Calc the 'end' offset past the attributes array */
+                pvt = edac_align_ptr(&dev_attrib[count], sz_private);
+        } else {
+                /* no attribute array specificed */
+                pvt = edac_align_ptr(dev_attrib, sz_private);
+        }
 
         /* 'pvt' now points to where the private data area is.
          * At this point 'pvt' (like dev_inst,dev_blk and dev_attrib)
@@ -156,8 +162,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
         /* Name of this edac device */
         snprintf(dev_ctl->name,sizeof(dev_ctl->name),"%s",edac_device_name);
 
-        edac_dbg(4, "edac_dev=%p next after end=%p\n",
-                 dev_ctl, pvt + sz_private);
+        debugf4("%s() edac_dev=%p next after end=%p\n",
+                __func__, dev_ctl, pvt + sz_private );
 
         /* Initialize every Instance */
         for (instance = 0; instance < nr_instances; instance++) {
@@ -178,8 +184,10 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
                         snprintf(blk->name, sizeof(blk->name),
                                  "%s%d", edac_block_name, block+offset_value);
 
-                        edac_dbg(4, "instance=%d inst_p=%p block=#%d block_p=%p name='%s'\n",
-                                 instance, inst, block, blk, blk->name);
+                        debugf4("%s() instance=%d inst_p=%p block=#%d "
+                                "block_p=%p name='%s'\n",
+                                __func__, instance, inst, block,
+                                blk, blk->name);
 
                         /* if there are NO attributes OR no attribute pointer
                          * then continue on to next block iteration
@@ -192,8 +200,8 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
                         attrib_p = &dev_attrib[block*nr_instances*nr_attrib];
                         blk->block_attributes = attrib_p;
 
-                        edac_dbg(4, "THIS BLOCK_ATTRIB=%p\n",
-                                 blk->block_attributes);
+                        debugf4("%s() THIS BLOCK_ATTRIB=%p\n",
+                                __func__, blk->block_attributes);
 
                         /* Initialize every user specified attribute in this
                          * block with the data the caller passed in
@@ -212,10 +220,11 @@ struct edac_device_ctl_info *edac_device_alloc_ctl_info(
 
                                 attrib->block = blk;    /* up link */
 
-                                edac_dbg(4, "alloc-attrib=%p attrib_name='%s' attrib-spec=%p spec-name=%s\n",
-                                         attrib, attrib->attr.name,
-                                         &attrib_spec[attr],
-                                         attrib_spec[attr].attr.name
+                                debugf4("%s() alloc-attrib=%p attrib_name='%s' "
+                                        "attrib-spec=%p spec-name=%s\n",
+                                        __func__, attrib, attrib->attr.name,
+                                        &attrib_spec[attr],
+                                        attrib_spec[attr].attr.name
                                         );
                         }
                 }
@@ -270,7 +279,7 @@ static struct edac_device_ctl_info *find_edac_device_by_dev(struct device *dev)
         struct edac_device_ctl_info *edac_dev;
         struct list_head *item;
 
-        edac_dbg(0, "\n");
+        debugf0("%s()\n", __func__);
 
         list_for_each(item, &edac_device_list) {
                 edac_dev = list_entry(item, struct edac_device_ctl_info, link);
@@ -386,7 +395,7 @@ static void edac_device_workq_function(struct work_struct *work_req)
 
         /* Reschedule the workq for the next time period to start again
          * if the number of msec is for 1 sec, then adjust to the next
-         * whole one second to save timers firing all over the period
+         * whole one second to save timers fireing all over the period
          * between integral seconds
          */
         if (edac_dev->poll_msec == 1000)
@@ -405,7 +414,7 @@ static void edac_device_workq_function(struct work_struct *work_req)
 void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
                                 unsigned msec)
 {
-        edac_dbg(0, "\n");
+        debugf0("%s()\n", __func__);
 
         /* take the arg 'msec' and set it into the control structure
          * to used in the time period calculation
@@ -493,7 +502,7 @@ EXPORT_SYMBOL_GPL(edac_device_alloc_index);
  */
 int edac_device_add_device(struct edac_device_ctl_info *edac_dev)
 {
-        edac_dbg(0, "\n");
+        debugf0("%s()\n", __func__);
 
 #ifdef CONFIG_EDAC_DEBUG
         if (edac_debug_level >= 3)
@@ -555,7 +564,7 @@ EXPORT_SYMBOL_GPL(edac_device_add_device);
  *      Remove sysfs entries for specified edac_device structure and
  *      then remove edac_device structure from global list
  *
- * @dev:
+ * @pdev:
  *      Pointer to 'struct device' representing edac_device
  *      structure to remove.
  *
@@ -567,7 +576,7 @@ struct edac_device_ctl_info *edac_device_del_device(struct device *dev)
 {
         struct edac_device_ctl_info *edac_dev;
 
-        edac_dbg(0, "\n");
+        debugf0("%s()\n", __func__);
 
         mutex_lock(&device_ctls_mutex);