Merge tag 'backlight-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / ras / cec.c

diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
index 569d9ad..ddecf25 100644 (file)
--- a/drivers/ras/cec.c
+++ b/drivers/ras/cec.c
@@ -435,7 +435,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(action_threshold_ops, u64_get, action_threshold_set, "%
 
 static const char * const bins[] = { "00", "01", "10", "11" };
 
-static int array_dump(struct seq_file *m, void *v)
+static int array_show(struct seq_file *m, void *v)
 {
        struct ce_array *ca = &ce_arr;
        int i;
@@ -467,18 +467,7 @@ static int array_dump(struct seq_file *m, void *v)
        return 0;
 }
 
-static int array_open(struct inode *inode, struct file *filp)
-{
-       return single_open(filp, array_dump, NULL);
-}
-
-static const struct file_operations array_ops = {
-       .owner   = THIS_MODULE,
-       .open    = array_open,
-       .read    = seq_read,
-       .llseek  = seq_lseek,
-       .release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(array);
 
 static int __init create_debugfs_nodes(void)
 {
@@ -513,7 +502,7 @@ static int __init create_debugfs_nodes(void)
                goto err;
        }
 
-       array = debugfs_create_file("array", S_IRUSR, d, NULL, &array_ops);
+       array = debugfs_create_file("array", S_IRUSR, d, NULL, &array_fops);
        if (!array) {
                pr_warn("Error creating array debugfs node!\n");
                goto err;
@@ -553,20 +542,20 @@ static struct notifier_block cec_nb = {
        .priority       = MCE_PRIO_CEC,
 };
 
-static void __init cec_init(void)
+static int __init cec_init(void)
 {
        if (ce_arr.disabled)
-               return;
+               return -ENODEV;
 
        ce_arr.array = (void *)get_zeroed_page(GFP_KERNEL);
        if (!ce_arr.array) {
                pr_err("Error allocating CE array page!\n");
-               return;
+               return -ENOMEM;
        }
 
        if (create_debugfs_nodes()) {
                free_page((unsigned long)ce_arr.array);
-               return;
+               return -ENOMEM;
        }
 
        INIT_DELAYED_WORK(&cec_work, cec_work_fn);
@@ -575,6 +564,7 @@ static void __init cec_init(void)
        mce_register_decode_chain(&cec_nb);
 
        pr_info("Correctable Errors collector initialized.\n");
+       return 0;
 }
 late_initcall(cec_init);