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>

diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c
index c8147f1d9eddc3284fb481b28607900685bebd1a..06a46260d36ecff32a6e42b14064f724e005e10e 100644 (file)
--- a/drivers/edac/altera_edac.c
+++ b/drivers/edac/altera_edac.c
@@ -680,7 +680,7 @@ static void altr_create_edacdev_dbgfs(struct edac_device_ctl_info *edac_dci,
        if (!drvdata->debugfs_dir)
                return;
 
-       if (!edac_debugfs_create_file(priv->dbgfs_name, S_IWUSR,
+       if (!edac_debugfs_create_file("altr_trigger", S_IWUSR,
                                      drvdata->debugfs_dir, edac_dci,
                                      priv->inject_fops))
                debugfs_remove_recursive(drvdata->debugfs_dir);
@@ -1108,7 +1108,6 @@ static const struct edac_device_prv_data ocramecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_SERR),
        .ue_clear_mask = (ALTR_OCR_ECC_EN | ALTR_OCR_ECC_DERR),
-       .dbgfs_name = "altr_ocram_trigger",
        .alloc_mem = ocram_alloc_mem,
        .free_mem = ocram_free_mem,
        .ecc_enable_mask = ALTR_OCR_ECC_EN,
@@ -1125,7 +1124,6 @@ static const struct edac_device_prv_data a10_ocramecc_data = {
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
        .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_OCRAM,
-       .dbgfs_name = "altr_ocram_trigger",
        .ecc_enable_mask = ALTR_A10_OCRAM_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1228,7 +1226,6 @@ static const struct edac_device_prv_data l2ecc_data = {
        .setup = altr_l2_check_deps,
        .ce_clear_mask = 0,
        .ue_clear_mask = 0,
-       .dbgfs_name = "altr_l2_trigger",
        .alloc_mem = l2_alloc_mem,
        .free_mem = l2_free_mem,
        .ecc_enable_mask = ALTR_L2_ECC_EN,
@@ -1244,7 +1241,6 @@ static const struct edac_device_prv_data a10_l2ecc_data = {
        .ce_clear_mask = ALTR_A10_L2_ECC_SERR_CLR,
        .ue_clear_mask = ALTR_A10_L2_ECC_MERR_CLR,
        .irq_status_mask = A10_SYSMGR_ECC_INTSTAT_L2,
-       .dbgfs_name = "altr_l2_trigger",
        .alloc_mem = l2_alloc_mem,
        .free_mem = l2_free_mem,
        .ecc_enable_mask = ALTR_A10_L2_ECC_EN_CTL,
@@ -1266,7 +1262,6 @@ static const struct edac_device_prv_data a10_enetecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1293,7 +1288,6 @@ static const struct edac_device_prv_data a10_nandecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1320,7 +1314,6 @@ static const struct edac_device_prv_data a10_dmaecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1347,7 +1340,6 @@ static const struct edac_device_prv_data a10_usbecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1374,7 +1366,6 @@ static const struct edac_device_prv_data a10_qspiecc_data = {
        .setup = altr_check_ecc_deps,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRA,
@@ -1524,7 +1515,6 @@ static const struct edac_device_prv_data a10_sdmmcecca_data = {
        .setup = altr_portb_setup,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENA,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENA,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_SERRPENA,
@@ -1538,7 +1528,6 @@ static const struct edac_device_prv_data a10_sdmmceccb_data = {
        .setup = altr_portb_setup,
        .ce_clear_mask = ALTR_A10_ECC_SERRPENB,
        .ue_clear_mask = ALTR_A10_ECC_DERRPENB,
-       .dbgfs_name = "altr_trigger",
        .ecc_enable_mask = ALTR_A10_COMMON_ECC_EN_CTL,
        .ecc_en_ofst = ALTR_A10_ECC_CTRL_OFST,
        .ce_set_mask = ALTR_A10_ECC_TSERRB,

diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h
index cf3a68bec100a8913236d0b45b4e2a4110fd9e89..cbc96290f7439ba7d6e922de99a6c1b1764ad460 100644 (file)
--- a/drivers/edac/altera_edac.h
+++ b/drivers/edac/altera_edac.h
@@ -303,7 +303,6 @@ struct edac_device_prv_data {
        int ce_clear_mask;
        int ue_clear_mask;
        int irq_status_mask;
-       char dbgfs_name[20];
        void * (*alloc_mem)(size_t size, void **other);
        void (*free_mem)(void *p, size_t size, void *other);
        int ecc_enable_mask;