Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad4d6e23 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

mpc85xx_edac: convert driver to use the new edac ABI 



The legacy edac ABI is going to be removed. Port the driver to use
and benefit from the new API functionality.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohui Xie <Shaohui.Xie@freescale.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 70521358

drivers/edac/mpc85xx_edac.c

+17 −5
Original line number Diff line number Diff line
@@ -854,12 +854,16 @@ static void mpc85xx_mc_check(struct mem_ctl_info *mci) 
		mpc85xx_mc_printk(mci, KERN_ERR, "PFN out of range!\n");



	if (err_detect & DDR_EDE_SBE)

		edac_mc_handle_ce(mci, pfn, err_addr & ~PAGE_MASK,

				  syndrome, row_index, 0, mci->ctl_name);

		edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,

				     pfn, err_addr & ~PAGE_MASK, syndrome,

				     row_index, 0, -1,

				     mci->ctl_name, "", NULL);



	if (err_detect & DDR_EDE_MBE)

		edac_mc_handle_ue(mci, pfn, err_addr & ~PAGE_MASK,

				  row_index, mci->ctl_name);

		edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,

				     pfn, err_addr & ~PAGE_MASK, syndrome,

				     row_index, 0, -1,

				     mci->ctl_name, "", NULL);



	out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_DETECT, err_detect);

}
@@ -961,6 +965,7 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) 
static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)

{

	struct mem_ctl_info *mci;

	struct edac_mc_layer layers[2];

	struct mpc85xx_mc_pdata *pdata;

	struct resource r;

	u32 sdram_ctl;
@@ -969,7 +974,14 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) 
	if (!devres_open_group(&op->dev, mpc85xx_mc_err_probe, GFP_KERNEL))

		return -ENOMEM;



	mci = edac_mc_alloc(sizeof(*pdata), 4, 1, edac_mc_idx);

	layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;

	layers[0].size = 4;

	layers[0].is_virt_csrow = true;

	layers[1].type = EDAC_MC_LAYER_CHANNEL;

	layers[1].size = 1;

	layers[1].is_virt_csrow = false;

	mci = new_edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers,

			    sizeof(*pdata));

	if (!mci) {

		devres_release_group(&op->dev, mpc85xx_mc_err_probe);

		return -ENOMEM;