tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

EDAC, altera: Rename device trigger to common name

The L2 and OCRAM devices have different ecc trigger names than the other
EDAC devices (FIFO peripherals). Make them all the same and remove the
character array from the device structure.

Signed-off-by: Thor Thayer <tthayer@opensource.altera.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1471622666-15197-2-git-send-email-tthayer@opensource.altera.com
Signed-off-by: Borislav Petkov <bp@suse.de>

authored by

Thor Thayer and committed by
Borislav Petkov f399f34b 6fa06b0d

+1 -13
+1 -12
drivers/edac/altera_edac.c
··· 680 680 if (!drvdata->debugfs_dir) 681 681 return; 682 682 683 - if (!edac_debugfs_create_file(priv->dbgfs_name, S_IWUSR, 683 + if (!edac_debugfs_create_file("altr_trigger", S_IWUSR, 684 684 drvdata->debugfs_dir, edac_dci, 685 685 priv->inject_fops)) 686 686 debugfs_remove_recursive(drvdata->debugfs_dir); ··· 1108 1108 .setup = altr_check_ecc_deps, 1109 1109 .ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR), 1110 1110 .ue_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_DERR), 1111 - .dbgfs_name = "altr_ocram_trigger", 1112 1111 .alloc_mem = ocram_alloc_mem, 1113 1112 .free_mem = ocram_free_mem, 1114 1113 .ecc_enable_mask = ALTR_OCR_ECC_EN, ··· 1124 1125 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1125 1126 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1126 1127 .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_OCRAM, 1127 - .dbgfs_name = "altr_ocram_trigger", 1128 1128 .ecc_enable_mask = ALTR_A10_OCRAM_ECC_EN_CTL, 1129 1129 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1130 1130 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1226 1228 .setup = altr_l2_check_deps, 1227 1229 .ce_clear_mask = 0, 1228 1230 .ue_clear_mask = 0, 1229 - .dbgfs_name = "altr_l2_trigger", 1230 1231 .alloc_mem = l2_alloc_mem, 1231 1232 .free_mem = l2_free_mem, 1232 1233 .ecc_enable_mask = ALTR_L2_ECC_EN, ··· 1241 1244 .ce_clear_mask = ALTR_A10_L2_ECC_SERR_CLR, 1242 1245 .ue_clear_mask = ALTR_A10_L2_ECC_MERR_CLR, 1243 1246 .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_L2, 1244 - .dbgfs_name = "altr_l2_trigger", 1245 1247 .alloc_mem = l2_alloc_mem, 1246 1248 .free_mem = l2_free_mem, 1247 1249 .ecc_enable_mask = ALTR_A10_L2_ECC_EN_CTL, ··· 1262 1266 .setup = altr_check_ecc_deps, 1263 1267 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1264 1268 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1265 - .dbgfs_name = "altr_trigger", 1266 1269 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1267 1270 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1268 1271 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1288 1293 .setup = altr_check_ecc_deps, 1289 1294 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1290 1295 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1291 - .dbgfs_name = "altr_trigger", 1292 1296 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1293 1297 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1294 1298 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1314 1320 .setup = altr_check_ecc_deps, 1315 1321 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1316 1322 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1317 - .dbgfs_name = "altr_trigger", 1318 1323 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1319 1324 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1320 1325 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1340 1347 .setup = altr_check_ecc_deps, 1341 1348 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1342 1349 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1343 - .dbgfs_name = "altr_trigger", 1344 1350 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1345 1351 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1346 1352 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1366 1374 .setup = altr_check_ecc_deps, 1367 1375 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1368 1376 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1369 - .dbgfs_name = "altr_trigger", 1370 1377 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1371 1378 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1372 1379 .ce_set_mask = ALTR_A10_ECC_TSERRA, ··· 1515 1524 .setup = altr_portb_setup, 1516 1525 .ce_clear_mask = ALTR_A10_ECC_SERRPENA, 1517 1526 .ue_clear_mask = ALTR_A10_ECC_DERRPENA, 1518 - .dbgfs_name = "altr_trigger", 1519 1527 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1520 1528 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1521 1529 .ce_set_mask = ALTR_A10_ECC_SERRPENA, ··· 1528 1538 .setup = altr_portb_setup, 1529 1539 .ce_clear_mask = ALTR_A10_ECC_SERRPENB, 1530 1540 .ue_clear_mask = ALTR_A10_ECC_DERRPENB, 1531 - .dbgfs_name = "altr_trigger", 1532 1541 .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL, 1533 1542 .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST, 1534 1543 .ce_set_mask = ALTR_A10_ECC_TSERRB,
-1
drivers/edac/altera_edac.h
··· 303 303 int ce_clear_mask; 304 304 int ue_clear_mask; 305 305 int irq_status_mask; 306 - char dbgfs_name[20]; 307 306 void * (*alloc_mem)(size_t size, void **other); 308 307 void (*free_mem)(void *p, size_t size, void *other); 309 308 int ecc_enable_mask;