Skip to content

Commit e94ee64

Browse files
committed
Merge tag 'edac_updates_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC updates from Borislav Petkov: - skx_edac: Fix overflow when decoding 32G DIMM ranks - i10nm_edac: Add Sierra Forest support - amd64_edac: Split driver code between legacy and SMCA systems. The final goal is adding support for more hw, like GPUs - The usual minor cleanups and fixes * tag 'edac_updates_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: (25 commits) EDAC/i10nm: Add Intel Sierra Forest server support EDAC/amd64: Fix indentation in umc_determine_edac_cap() EDAC/altera: Remove MODULE_LICENSE in non-module EDAC: Sanitize MODULE_AUTHOR strings EDAC/amd81[13]1: Remove trailing newline from MODULE_AUTHOR EDAC/amd64: Add get_err_info() to pvt->ops EDAC/amd64: Split dump_misc_regs() into dct/umc functions EDAC/amd64: Split init_csrows() into dct/umc functions EDAC/amd64: Split determine_edac_cap() into dct/umc functions EDAC/amd64: Rename f17h_determine_edac_ctl_cap() EDAC/amd64: Split setup_mci_misc_attrs() into dct/umc functions EDAC/amd64: Split ecc_enabled() into dct/umc functions EDAC/amd64: Split read_mc_regs() into dct/umc functions EDAC/amd64: Split determine_memory_type() into dct/umc functions EDAC/amd64: Split read_base_mask() into dct/umc functions EDAC/amd64: Split prep_chip_selects() into dct/umc functions EDAC/amd64: Rework hw_info_{get,put} EDAC/amd64: Merge struct amd64_family_type into struct amd64_pvt EDAC/amd64: Do not discover ECC symbol size for Family 17h and later EDAC/amd64: Drop dbam_to_cs() for Family 17h and later ...
2 parents f730127 + ce8ac91 commit e94ee64

15 files changed

Lines changed: 490 additions & 645 deletions

drivers/edac/altera_edac.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,10 +2149,8 @@ static int altr_edac_a10_probe(struct platform_device *pdev)
21492149
}
21502150

21512151
edac->sb_irq = platform_get_irq(pdev, 0);
2152-
if (edac->sb_irq < 0) {
2153-
dev_err(&pdev->dev, "No SBERR IRQ resource\n");
2152+
if (edac->sb_irq < 0)
21542153
return edac->sb_irq;
2155-
}
21562154

21572155
irq_set_chained_handler_and_data(edac->sb_irq,
21582156
altr_edac_a10_irq_handler,
@@ -2184,10 +2182,9 @@ static int altr_edac_a10_probe(struct platform_device *pdev)
21842182
}
21852183
#else
21862184
edac->db_irq = platform_get_irq(pdev, 1);
2187-
if (edac->db_irq < 0) {
2188-
dev_err(&pdev->dev, "No DBERR IRQ resource\n");
2185+
if (edac->db_irq < 0)
21892186
return edac->db_irq;
2190-
}
2187+
21912188
irq_set_chained_handler_and_data(edac->db_irq,
21922189
altr_edac_a10_irq_handler, edac);
21932190
#endif
@@ -2226,6 +2223,5 @@ static struct platform_driver altr_edac_a10_driver = {
22262223
};
22272224
module_platform_driver(altr_edac_a10_driver);
22282225

2229-
MODULE_LICENSE("GPL v2");
22302226
MODULE_AUTHOR("Thor Thayer");
22312227
MODULE_DESCRIPTION("EDAC Driver for Altera Memories");

0 commit comments

Comments
 (0)