Merge tag 'edac_updates_for_v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / edac / xgene_edac.c

diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c
index 1b50f816001393a72af2087b9a59e8e25ab245dc..fd87f1b2c1453ea76c873e187d443c34d1e96038 100644 (file)
--- a/drivers/edac/xgene_edac.c
+++ b/drivers/edac/xgene_edac.c
@@ -913,8 +913,8 @@ static int xgene_edac_pmd_add(struct xgene_edac *edac, struct device_node *np,
 
        snprintf(edac_name, sizeof(edac_name), "l2c%d", pmd);
        edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx),
-                                             edac_name, 1, "l2c", 1, 2, NULL,
-                                             0, edac_device_alloc_index());
+                                             edac_name, 1, "l2c", 1, 2,
+                                             edac_device_alloc_index());
        if (!edac_dev) {
                rc = -ENOMEM;
                goto err_group;
@@ -1208,8 +1208,7 @@ static int xgene_edac_l3_add(struct xgene_edac *edac, struct device_node *np,
 
        edac_idx = edac_device_alloc_index();
        edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx),
-                                             "l3c", 1, "l3c", 1, 0, NULL, 0,
-                                             edac_idx);
+                                             "l3c", 1, "l3c", 1, 0, edac_idx);
        if (!edac_dev) {
                rc = -ENOMEM;
                goto err_release_group;
@@ -1748,8 +1747,7 @@ static int xgene_edac_soc_add(struct xgene_edac *edac, struct device_node *np,
 
        edac_idx = edac_device_alloc_index();
        edac_dev = edac_device_alloc_ctl_info(sizeof(*ctx),
-                                             "SOC", 1, "SOC", 1, 2, NULL, 0,
-                                             edac_idx);
+                                             "SOC", 1, "SOC", 1, 2, edac_idx);
        if (!edac_dev) {
                rc = -ENOMEM;
                goto err_release_group;