EDAC, octeon: Fix broken build due to model helper renames

Commit

  debe6a623d3c ("MIPS: OCTEON: Update octeon-model.h code for new SoCs.")

renamed some SoC model helper functions, but forgot to update the EDAC
drivers resulting in build failures. Fix that.

Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/1435747132-10954-1-git-send-email-aaro.koskinen@nokia.com
Signed-off-by: Borislav Petkov <bp@suse.de>

diff --git a/drivers/edac/octeon_edac-l2c.c b/drivers/edac/octeon_edac-l2c.c
index 7e98084d36451efe894f5f33c1a3b77748183af3..afea7fc625ccb30bec2c3f69e1dadf1b74dadac2 100644 (file)
--- a/drivers/edac/octeon_edac-l2c.c
+++ b/drivers/edac/octeon_edac-l2c.c
@@ -151,7 +151,7 @@ static int octeon_l2c_probe(struct platform_device *pdev)
        l2c->ctl_name = "octeon_l2c_err";
 
 
-       if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
+       if (OCTEON_IS_OCTEON1PLUS()) {
                union cvmx_l2t_err l2t_err;
                union cvmx_l2d_err l2d_err;
 

diff --git a/drivers/edac/octeon_edac-lmc.c b/drivers/edac/octeon_edac-lmc.c
index bb19e0732681ce6a4af6c2e980c0c4bb382889f9..cda6dab5067a57709393fad7913a2e76a531a23b 100644 (file)
--- a/drivers/edac/octeon_edac-lmc.c
+++ b/drivers/edac/octeon_edac-lmc.c
@@ -234,7 +234,7 @@ static int octeon_lmc_edac_probe(struct platform_device *pdev)
        layers[0].size = 1;
        layers[0].is_virt_csrow = false;
 
-       if (OCTEON_IS_MODEL(OCTEON_FAM_1_PLUS)) {
+       if (OCTEON_IS_OCTEON1PLUS()) {
                union cvmx_lmcx_mem_cfg0 cfg0;
 
                cfg0.u64 = cvmx_read_csr(CVMX_LMCX_MEM_CFG0(0));

diff --git a/drivers/edac/octeon_edac-pc.c b/drivers/edac/octeon_edac-pc.c
index 0f83c33a7d1fcbb08180d60609aafc92e76a6425..2ab6cf24c9598f0be36dba02cb6f024495e667da 100644 (file)
--- a/drivers/edac/octeon_edac-pc.c
+++ b/drivers/edac/octeon_edac-pc.c
@@ -73,7 +73,7 @@ static int  co_cache_error_event(struct notifier_block *this,
                        edac_device_handle_ce(p->ed, cpu, 0, "dcache");
 
                /* Clear the error indication */
-               if (OCTEON_IS_MODEL(OCTEON_FAM_2))
+               if (OCTEON_IS_OCTEON2())
                        write_octeon_c0_dcacheerr(1);
                else
                        write_octeon_c0_dcacheerr(0);