5 files changed, 15 insertions, 8 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index d6c0c6590607..b86228cce672 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2642,8 +2642,15 @@ static int amd64_init_one_instance(struct pci_dev *F2)
         layers[0].size = pvt->csels[0].b_cnt;
         layers[0].is_virt_csrow = true;
         layers[1].type = EDAC_MC_LAYER_CHANNEL;
-        layers[1].size = pvt->channel_count;
+
+        /*
+         * Always allocate two channels since we can have setups with DIMMs on
+         * only one channel. Also, this simplifies handling later for the price
+         * of a couple of KBs tops.
+         */
+        layers[1].size = 2;
         layers[1].is_virt_csrow = false;
+
         mci = edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, 0);
         if (!mci)
                 goto err_siblings;
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 7f3c57113ba1..df6575f1430d 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -789,7 +789,7 @@ static struct cpc925_dev_info cpc925_devs[] = {
         .exit = cpc925_htlink_exit,
         .check = cpc925_htlink_check,
         },
-        {0}, /* Terminated by NULL */
+        { }
 };
 
 /*
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index e7c32c4f7837..9f7e0e609516 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -58,8 +58,10 @@ static int edac_set_poll_msec(const char *val, struct kernel_param *kp)
         if (!val)
                 return -EINVAL;
 
-        ret = strict_strtol(val, 0, &l);
-        if (ret == -EINVAL || ((int)l != l))
+        ret = kstrtol(val, 0, &l);
+        if (ret)
+                return ret;
+        if ((int)l != l)
                 return -EINVAL;
         *((int *)kp->arg) = l;
 
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index aa44c1718f50..be10a74b16ea 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -260,8 +260,7 @@ static void i3200_check(struct mem_ctl_info *mci)
         i3200_process_error_info(mci, &info);
 }
 
-
-void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
+static void __iomem *i3200_map_mchbar(struct pci_dev *pdev)
 {
         union {
                 u64 mchbar;
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
index c9db24d95caa..1a4df82376ba 100644
--- a/drivers/edac/x38_edac.c
+++ b/drivers/edac/x38_edac.c
@@ -248,8 +248,7 @@ static void x38_check(struct mem_ctl_info *mci)
         x38_process_error_info(mci, &info);
 }
 
-
-void __iomem *x38_map_mchbar(struct pci_dev *pdev)
+static void __iomem *x38_map_mchbar(struct pci_dev *pdev)
 {
         union {
                 u64 mchbar;