Commit 52490c8d authored by Douglas Thompson's avatar Douglas Thompson Committed by Linus Torvalds

drivers/edac: edac_device code tidying

For the file edac_device.c perform some coding style enhancements
Add some function header comments
Made for better readability commands
Signed-off-by: default avatarDouglas Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2ccaeca
...@@ -470,8 +470,6 @@ struct edac_device_counter { ...@@ -470,8 +470,6 @@ struct edac_device_counter {
u32 ce_count; u32 ce_count;
}; };
#define INC_COUNTER(cnt) (cnt++)
/* /*
* An array of these is passed to the alloc() function * An array of these is passed to the alloc() function
* to specify attributes of the edac_block * to specify attributes of the edac_block
...@@ -632,15 +630,6 @@ struct edac_device_ctl_info { ...@@ -632,15 +630,6 @@ struct edac_device_ctl_info {
#define to_edac_device_ctl_work(w) \ #define to_edac_device_ctl_work(w) \
container_of(w,struct edac_device_ctl_info,work) container_of(w,struct edac_device_ctl_info,work)
/* Function to calc the number of delay jiffies from poll_msec */
static inline void edac_device_calc_delay(struct edac_device_ctl_info *edac_dev)
{
/* convert from msec to jiffies */
edac_dev->delay = edac_dev->poll_msec * HZ / 1000;
}
#define edac_calc_delay(dev) dev->delay = dev->poll_msec * HZ / 1000;
/* /*
* The alloc() and free() functions for the 'edac_device' control info * The alloc() and free() functions for the 'edac_device' control info
* structure. A MC driver will allocate one of these for each edac_device * structure. A MC driver will allocate one of these for each edac_device
......
This diff is collapsed.
...@@ -292,8 +292,8 @@ static void edac_device_ctrl_instance_release(struct kobject *kobj) ...@@ -292,8 +292,8 @@ static void edac_device_ctrl_instance_release(struct kobject *kobj)
/* instance specific attribute structure */ /* instance specific attribute structure */
struct instance_attribute { struct instance_attribute {
struct attribute attr; struct attribute attr;
ssize_t(*show) (struct edac_device_instance *, char *); ssize_t(*show) (struct edac_device_instance *, char *);
ssize_t(*store) (struct edac_device_instance *, const char *, size_t); ssize_t(*store) (struct edac_device_instance *, const char *, size_t);
}; };
/* Function to 'show' fields from the edac_dev 'instance' structure */ /* Function to 'show' fields from the edac_dev 'instance' structure */
...@@ -540,9 +540,8 @@ static int edac_device_create_instance(struct edac_device_ctl_info *edac_dev, ...@@ -540,9 +540,8 @@ static int edac_device_create_instance(struct edac_device_ctl_info *edac_dev,
for (i = 0; i < instance->nr_blocks; i++) { for (i = 0; i < instance->nr_blocks; i++) {
err = edac_device_create_block(edac_dev, instance, i); err = edac_device_create_block(edac_dev, instance, i);
if (err) { if (err) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++)
edac_device_delete_block(edac_dev, instance, j); edac_device_delete_block(edac_dev, instance, j);
}
return err; return err;
} }
} }
...@@ -566,9 +565,8 @@ static void edac_device_delete_instance(struct edac_device_ctl_info *edac_dev, ...@@ -566,9 +565,8 @@ static void edac_device_delete_instance(struct edac_device_ctl_info *edac_dev,
instance = &edac_dev->instances[idx]; instance = &edac_dev->instances[idx];
/* unregister all blocks in this instance */ /* unregister all blocks in this instance */
for (i = 0; i < instance->nr_blocks; i++) { for (i = 0; i < instance->nr_blocks; i++)
edac_device_delete_block(edac_dev, instance, i); edac_device_delete_block(edac_dev, instance, i);
}
/* unregister this instance's kobject */ /* unregister this instance's kobject */
init_completion(&instance->kobj_complete); init_completion(&instance->kobj_complete);
...@@ -593,9 +591,8 @@ static int edac_device_create_instances(struct edac_device_ctl_info *edac_dev) ...@@ -593,9 +591,8 @@ static int edac_device_create_instances(struct edac_device_ctl_info *edac_dev)
err = edac_device_create_instance(edac_dev, i); err = edac_device_create_instance(edac_dev, i);
if (err) { if (err) {
/* unwind previous instances on error */ /* unwind previous instances on error */
for (j = 0; j < i; j++) { for (j = 0; j < i; j++)
edac_device_delete_instance(edac_dev, j); edac_device_delete_instance(edac_dev, j);
}
return err; return err;
} }
} }
...@@ -612,9 +609,8 @@ static void edac_device_delete_instances(struct edac_device_ctl_info *edac_dev) ...@@ -612,9 +609,8 @@ static void edac_device_delete_instances(struct edac_device_ctl_info *edac_dev)
int i; int i;
/* iterate over creation of the instances */ /* iterate over creation of the instances */
for (i = 0; i < edac_dev->nr_instances; i++) { for (i = 0; i < edac_dev->nr_instances; i++)
edac_device_delete_instance(edac_dev, i); edac_device_delete_instance(edac_dev, i);
}
} }
/******************* edac_dev sysfs ctor/dtor code *************/ /******************* edac_dev sysfs ctor/dtor code *************/
...@@ -637,9 +633,8 @@ static int edac_device_add_sysfs_attributes( ...@@ -637,9 +633,8 @@ static int edac_device_add_sysfs_attributes(
while (sysfs_attrib->attr.name != NULL) { while (sysfs_attrib->attr.name != NULL) {
err = sysfs_create_file(&edac_dev->kobj, err = sysfs_create_file(&edac_dev->kobj,
(struct attribute*) sysfs_attrib); (struct attribute*) sysfs_attrib);
if (err) { if (err)
return err; return err;
}
sysfs_attrib++; sysfs_attrib++;
} }
...@@ -696,9 +691,8 @@ int edac_device_create_sysfs(struct edac_device_ctl_info *edac_dev) ...@@ -696,9 +691,8 @@ int edac_device_create_sysfs(struct edac_device_ctl_info *edac_dev)
/* Create the first level instance directories */ /* Create the first level instance directories */
err = edac_device_create_instances(edac_dev); err = edac_device_create_instances(edac_dev);
if (err) { if (err)
goto err_remove_link; goto err_remove_link;
}
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment