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, 45 insertions, 44 deletions

diff --git a/drivers/edac/amd64_edac_dbg.c b/drivers/edac/amd64_edac_dbg.c
index e3562288f4ce..2c1bbf740605 100644
--- a/drivers/edac/amd64_edac_dbg.c
+++ b/drivers/edac/amd64_edac_dbg.c
@@ -1,8 +1,11 @@
 #include "amd64_edac.h"
 
 #define EDAC_DCT_ATTR_SHOW(reg)                                         \
-static ssize_t amd64_##reg##_show(struct mem_ctl_info *mci, char *data) \
+static ssize_t amd64_##reg##_show(struct device *dev,                   \
+                               struct device_attribute *mattr,          \
+                               char *data)                              \
 {                                                                       \
+        struct mem_ctl_info *mci = to_mci(dev);                         \
         struct amd64_pvt *pvt = mci->pvt_info;                          \
                 return sprintf(data, "0x%016llx\n", (u64)pvt->reg);     \
 }
@@ -12,8 +15,12 @@ EDAC_DCT_ATTR_SHOW(dbam0);
 EDAC_DCT_ATTR_SHOW(top_mem);
 EDAC_DCT_ATTR_SHOW(top_mem2);
 
-static ssize_t amd64_hole_show(struct mem_ctl_info *mci, char *data)
+static ssize_t amd64_hole_show(struct device *dev,
+                               struct device_attribute *mattr,
+                               char *data)
 {
+        struct mem_ctl_info *mci = to_mci(dev);
+
         u64 hole_base = 0;
         u64 hole_offset = 0;
         u64 hole_size = 0;
@@ -27,46 +34,40 @@ static ssize_t amd64_hole_show(struct mem_ctl_info *mci, char *data)
 /*
  * update NUM_DBG_ATTRS in case you add new members
  */
-struct mcidev_sysfs_attribute amd64_dbg_attrs[] = {
+static DEVICE_ATTR(dhar, S_IRUGO, amd64_dhar_show, NULL);
+static DEVICE_ATTR(dbam, S_IRUGO, amd64_dbam0_show, NULL);
+static DEVICE_ATTR(topmem, S_IRUGO, amd64_top_mem_show, NULL);
+static DEVICE_ATTR(topmem2, S_IRUGO, amd64_top_mem2_show, NULL);
+static DEVICE_ATTR(dram_hole, S_IRUGO, amd64_hole_show, NULL);
+
+int amd64_create_sysfs_dbg_files(struct mem_ctl_info *mci)
+{
+        int rc;
+
+        rc = device_create_file(&mci->dev, &dev_attr_dhar);
+        if (rc < 0)
+                return rc;
+        rc = device_create_file(&mci->dev, &dev_attr_dbam);
+        if (rc < 0)
+                return rc;
+        rc = device_create_file(&mci->dev, &dev_attr_topmem);
+        if (rc < 0)
+                return rc;
+        rc = device_create_file(&mci->dev, &dev_attr_topmem2);
+        if (rc < 0)
+                return rc;
+        rc = device_create_file(&mci->dev, &dev_attr_dram_hole);
+        if (rc < 0)
+                return rc;
 
-        {
-                .attr = {
-                        .name = "dhar",
-                        .mode = (S_IRUGO)
-                },
-                .show = amd64_dhar_show,
-                .store = NULL,
-        },
-        {
-                .attr = {
-                        .name = "dbam",
-                        .mode = (S_IRUGO)
-                },
-                .show = amd64_dbam0_show,
-                .store = NULL,
-        },
-        {
-                .attr = {
-                        .name = "topmem",
-                        .mode = (S_IRUGO)
-                },
-                .show = amd64_top_mem_show,
-                .store = NULL,
-        },
-        {
-                .attr = {
-                        .name = "topmem2",
-                        .mode = (S_IRUGO)
-                },
-                .show = amd64_top_mem2_show,
-                .store = NULL,
-        },
-        {
-                .attr = {
-                        .name = "dram_hole",
-                        .mode = (S_IRUGO)
-                },
-                .show = amd64_hole_show,
-                .store = NULL,
-        },
-};
+        return 0;
+}
+
+void amd64_remove_sysfs_dbg_files(struct mem_ctl_info *mci)
+{
+        device_remove_file(&mci->dev, &dev_attr_dhar);
+        device_remove_file(&mci->dev, &dev_attr_dbam);
+        device_remove_file(&mci->dev, &dev_attr_topmem);
+        device_remove_file(&mci->dev, &dev_attr_topmem2);
+        device_remove_file(&mci->dev, &dev_attr_dram_hole);
+}