EDAC: Use proper list of struct attribute for attributes

[linux-2.6-microblaze.git] / drivers / edac / edac_device_sysfs.c

diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
index 5e75937..f4aefce 100644 (file)
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
@@ -163,11 +163,11 @@ CTL_INFO_ATTR(poll_msec, S_IRUGO | S_IWUSR,
        edac_device_ctl_poll_msec_show, edac_device_ctl_poll_msec_store);
 
 /* Base Attributes of the EDAC_DEVICE ECC object */
-static struct ctl_info_attribute *device_ctrl_attr[] = {
-       &attr_ctl_info_panic_on_ue,
-       &attr_ctl_info_log_ue,
-       &attr_ctl_info_log_ce,
-       &attr_ctl_info_poll_msec,
+static struct attribute *device_ctrl_attr[] = {
+       &attr_ctl_info_panic_on_ue.attr,
+       &attr_ctl_info_log_ue.attr,
+       &attr_ctl_info_log_ce.attr,
+       &attr_ctl_info_poll_msec.attr,
        NULL,
 };
 
@@ -217,7 +217,7 @@ static void edac_device_ctrl_master_release(struct kobject *kobj)
 static struct kobj_type ktype_device_ctrl = {
        .release = edac_device_ctrl_master_release,
        .sysfs_ops = &device_ctl_info_ops,
-       .default_attrs = (struct attribute **)device_ctrl_attr,
+       .default_attrs = device_ctrl_attr,
 };
 
 /*
@@ -389,9 +389,9 @@ INSTANCE_ATTR(ce_count, S_IRUGO, instance_ce_count_show, NULL);
 INSTANCE_ATTR(ue_count, S_IRUGO, instance_ue_count_show, NULL);
 
 /* list of edac_dev 'instance' attributes */
-static struct instance_attribute *device_instance_attr[] = {
-       &attr_instance_ce_count,
-       &attr_instance_ue_count,
+static struct attribute *device_instance_attr[] = {
+       &attr_instance_ce_count.attr,
+       &attr_instance_ue_count.attr,
        NULL,
 };
 
@@ -399,7 +399,7 @@ static struct instance_attribute *device_instance_attr[] = {
 static struct kobj_type ktype_instance_ctrl = {
        .release = edac_device_ctrl_instance_release,
        .sysfs_ops = &device_instance_ops,
-       .default_attrs = (struct attribute **)device_instance_attr,
+       .default_attrs = device_instance_attr,
 };
 
 /* edac_dev -> instance -> block information */
@@ -487,9 +487,9 @@ BLOCK_ATTR(ce_count, S_IRUGO, block_ce_count_show, NULL);
 BLOCK_ATTR(ue_count, S_IRUGO, block_ue_count_show, NULL);
 
 /* list of edac_dev 'block' attributes */
-static struct edac_dev_sysfs_block_attribute *device_block_attr[] = {
-       &attr_block_ce_count,
-       &attr_block_ue_count,
+static struct attribute *device_block_attr[] = {
+       &attr_block_ce_count.attr,
+       &attr_block_ue_count.attr,
        NULL,
 };
 
@@ -497,7 +497,7 @@ static struct edac_dev_sysfs_block_attribute *device_block_attr[] = {
 static struct kobj_type ktype_block_ctrl = {
        .release = edac_device_ctrl_block_release,
        .sysfs_ops = &device_block_ops,
-       .default_attrs = (struct attribute **)device_block_attr,
+       .default_attrs = device_block_attr,
 };
 
 /* block ctor/dtor  code */