diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 15:02:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 15:02:49 -0700 |
| commit | fe354159ca534071840a7d9bb1779d557e28f344 (patch) | |
| tree | 6461e65f03c9e86defbd84a10798980c8ed7c37b /drivers/edac/ti_edac.c | |
| parent | e66435936756d9bce96433be183358a8994a0f0d (diff) | |
| parent | 537bddd069c743759addf422d0b8f028ff0f8dbc (diff) | |
Merge tag 'edac_updates_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC updates from Borislav Petkov:
"A small pile of EDAC updates which the autumn wind blew my way. :)
- amd64_edac: Add support for three-rank interleaving mode which is
present on AMD zen2 servers
- The usual fixes and cleanups all over EDAC land"
* tag 'edac_updates_for_v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell
EDAC/ti: Remove redundant error messages
EDAC/amd64: Handle three rank interleaving mode
EDAC/mc_sysfs: Print MC-scope sysfs counters unsigned
EDAC/al_mc: Make use of the helper function devm_add_action_or_reset()
EDAC/mc: Replace strcpy(), sprintf() and snprintf() with strscpy() or scnprintf()
Diffstat (limited to 'drivers/edac/ti_edac.c')
| -rw-r--r-- | drivers/edac/ti_edac.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/edac/ti_edac.c b/drivers/edac/ti_edac.c index 169f96e51c29..6971ded598de 100644 --- a/drivers/edac/ti_edac.c +++ b/drivers/edac/ti_edac.c @@ -245,11 +245,8 @@ static int ti_edac_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); reg = devm_ioremap_resource(dev, res); - if (IS_ERR(reg)) { - edac_printk(KERN_ERR, EDAC_MOD_NAME, - "EMIF controller regs not defined\n"); + if (IS_ERR(reg)) return PTR_ERR(reg); - } layers[0].type = EDAC_MC_LAYER_ALL_MEM; layers[0].size = 1; @@ -281,8 +278,6 @@ static int ti_edac_probe(struct platform_device *pdev) error_irq = platform_get_irq(pdev, 0); if (error_irq < 0) { ret = error_irq; - edac_printk(KERN_ERR, EDAC_MOD_NAME, - "EMIF irq number not defined.\n"); goto err; } |