When compiled as a module, removing this module causes kernel warnings when irq_dispose_mapping() is called. Instead of calling irq_of_parse_and_map(), using platform_get_irq() to acquire the IRQ number.
Signed-off-by: York Sun <york....@nxp.com> --- Change log v4: Absorb name changes by "Rename macros and names" v3: no change v2: no change drivers/edac/fsl_ddr_edac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index 6d4dd84..d8ce1f6 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -563,7 +563,7 @@ int fsl_mc_err_probe(struct platform_device *op) ddr_out32(pdata->mc_vbase + FSL_MC_ERR_SBE, 0x10000); /* register interrupts */ - pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); + pdata->irq = platform_get_irq(op, 0); res = devm_request_irq(&op->dev, pdata->irq, fsl_mc_isr, IRQF_SHARED, @@ -571,7 +571,6 @@ int fsl_mc_err_probe(struct platform_device *op) if (res < 0) { pr_err("%s: Unable to request irq %d for FSL DDR DRAM ERR\n", __func__, pdata->irq); - irq_dispose_mapping(pdata->irq); res = -ENODEV; goto err2; } @@ -602,7 +601,6 @@ int fsl_mc_err_remove(struct platform_device *op) edac_dbg(0, "\n"); if (edac_op_state == EDAC_OPSTATE_INT) { - irq_dispose_mapping(pdata->irq); ddr_out32(pdata->mc_vbase + FSL_MC_ERR_INT_EN, 0); } -- 2.7.4