diff options
| author | York Sun <york.sun@nxp.com> | 2016-08-09 14:55:44 -0700 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2016-09-01 10:28:02 +0200 |
| commit | 55764ed37eec48ad1c1cb6784166055e06dcb9df (patch) | |
| tree | a1dc101485eaa76510d36a070c17d1c664606e85 /drivers/edac | |
| parent | 339fdff14c1ed34acc9c3368e01b56f80692cf83 (diff) | |
| download | linux-55764ed37eec48ad1c1cb6784166055e06dcb9df.tar.gz | |
EDAC, fsl_ddr: Fix IRQ dispose warning when module is removed
When compiled as a module, removing it causes kernel warnings when irq_dispose_mapping() is called. Instead of calling irq_of_parse_and_map(), use platform_get_irq() to acquire the IRQ number. Signed-off-by: York Sun <york.sun@nxp.com> Cc: linux-edac <linux-edac@vger.kernel.org> Cc: morbidrsa@gmail.com Cc: oss@buserror.net Cc: stuart.yoder@nxp.com Link: http://lkml.kernel.org/r/1470779760-16483-8-git-send-email-york.sun@nxp.com Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/fsl_ddr_edac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index 6d4dd84a9d48..d8ce1f635c38 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); } |