amd64_edac: convert sysfs logic to use struct device

Now that the EDAC core supports struct device, there's no sense
on having any logic at the EDAC core to simulate it. So, instead
of adding such logic there, change the logic at amd64_edac to
use it.

Reviewed-by: Aristeu Rozanski <arozansk@redhat.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 26 insertions, 17 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 821bc2cdd2de..9905834b560f 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2463,26 +2463,29 @@ static bool ecc_enabled(struct pci_dev *F3, u8 nid)
         return true;
 }
 
-struct mcidev_sysfs_attribute sysfs_attrs[ARRAY_SIZE(amd64_dbg_attrs) +
-                                          ARRAY_SIZE(amd64_inj_attrs) +
-                                          1];
-
-struct mcidev_sysfs_attribute terminator = { .attr = { .name = NULL } };
-
-static void set_mc_sysfs_attrs(struct mem_ctl_info *mci)
+static int set_mc_sysfs_attrs(struct mem_ctl_info *mci)
 {
-        unsigned int i = 0, j = 0;
+        int rc;
 
-        for (; i < ARRAY_SIZE(amd64_dbg_attrs); i++)
-                sysfs_attrs[i] = amd64_dbg_attrs[i];
+        rc = amd64_create_sysfs_dbg_files(mci);
+        if (rc < 0)
+                return rc;
 
-        if (boot_cpu_data.x86 >= 0x10)
-                for (j = 0; j < ARRAY_SIZE(amd64_inj_attrs); j++, i++)
-                        sysfs_attrs[i] = amd64_inj_attrs[j];
+        if (boot_cpu_data.x86 >= 0x10) {
+                rc = amd64_create_sysfs_inject_files(mci);
+                if (rc < 0)
+                        return rc;
+        }
+
+        return 0;
+}
 
-        sysfs_attrs[i] = terminator;
+static void del_mc_sysfs_attrs(struct mem_ctl_info *mci)
+{
+        amd64_remove_sysfs_dbg_files(mci);
 
-        mci->mc_driver_sysfs_attributes = sysfs_attrs;
+        if (boot_cpu_data.x86 >= 0x10)
+                amd64_remove_sysfs_inject_files(mci);
 }
 
 static void setup_mci_misc_attrs(struct mem_ctl_info *mci,
@@ -2608,13 +2611,15 @@ static int amd64_init_one_instance(struct pci_dev *F2)
         if (init_csrows(mci))
                 mci->edac_cap = EDAC_FLAG_NONE;
 
-        set_mc_sysfs_attrs(mci);
-
         ret = -ENODEV;
         if (edac_mc_add_mc(mci)) {
                 debugf1("failed edac_mc_add_mc()\n");
                 goto err_add_mc;
         }
+        if (set_mc_sysfs_attrs(mci)) {
+                debugf1("failed edac_mc_add_mc()\n");
+                goto err_add_sysfs;
+        }
 
         /* register stuff with EDAC MCE */
         if (report_gart_errors)
@@ -2628,6 +2633,8 @@ static int amd64_init_one_instance(struct pci_dev *F2)
 
         return 0;
 
+err_add_sysfs:
+        edac_mc_del_mc(mci->pdev);
 err_add_mc:
         edac_mc_free(mci);
 
@@ -2698,6 +2705,8 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
         struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
         struct ecc_settings *s = ecc_stngs[nid];
 
+        mci = find_mci_by_dev(&pdev->dev);
+        del_mc_sysfs_attrs(mci);
         /* Remove from EDAC CORE tracking list */
         mci = edac_mc_del_mc(&pdev->dev);
         if (!mci)