diff options
author | Borislav Petkov <bp@suse.de> | 2017-02-04 12:10:14 -0500 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2017-04-10 11:15:02 -0400 |
commit | bffc7dece92edd0b6445b76a378e2fa9e324c7ed (patch) | |
tree | 11b9f98adf740f313954a0e30163f51bf2d3700c | |
parent | fee27d7d97886515a60cce38b4152b7f5b5a21fc (diff) |
EDAC: Rename report status accessors
Change them to have the edac_ prefix.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r-- | drivers/acpi/acpi_extlog.c | 8 | ||||
-rw-r--r-- | drivers/edac/edac_mc.c | 8 | ||||
-rw-r--r-- | drivers/edac/pnd2_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/sb_edac.c | 4 | ||||
-rw-r--r-- | drivers/edac/skx_edac.c | 2 | ||||
-rw-r--r-- | include/linux/edac.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index a15270a806fc..502ea4dc2080 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c | |||
@@ -229,7 +229,7 @@ static int __init extlog_init(void) | |||
229 | if (!(cap & MCG_ELOG_P) || !extlog_get_l1addr()) | 229 | if (!(cap & MCG_ELOG_P) || !extlog_get_l1addr()) |
230 | return -ENODEV; | 230 | return -ENODEV; |
231 | 231 | ||
232 | if (get_edac_report_status() == EDAC_REPORTING_FORCE) { | 232 | if (edac_get_report_status() == EDAC_REPORTING_FORCE) { |
233 | pr_warn("Not loading eMCA, error reporting force-enabled through EDAC.\n"); | 233 | pr_warn("Not loading eMCA, error reporting force-enabled through EDAC.\n"); |
234 | return -EPERM; | 234 | return -EPERM; |
235 | } | 235 | } |
@@ -285,8 +285,8 @@ static int __init extlog_init(void) | |||
285 | * eMCA event report method has higher priority than EDAC method, | 285 | * eMCA event report method has higher priority than EDAC method, |
286 | * unless EDAC event report method is mandatory. | 286 | * unless EDAC event report method is mandatory. |
287 | */ | 287 | */ |
288 | old_edac_report_status = get_edac_report_status(); | 288 | old_edac_report_status = edac_get_report_status(); |
289 | set_edac_report_status(EDAC_REPORTING_DISABLED); | 289 | edac_set_report_status(EDAC_REPORTING_DISABLED); |
290 | mce_register_decode_chain(&extlog_mce_dec); | 290 | mce_register_decode_chain(&extlog_mce_dec); |
291 | /* enable OS to be involved to take over management from BIOS */ | 291 | /* enable OS to be involved to take over management from BIOS */ |
292 | ((struct extlog_l1_head *)extlog_l1_addr)->flags |= FLAG_OS_OPTIN; | 292 | ((struct extlog_l1_head *)extlog_l1_addr)->flags |= FLAG_OS_OPTIN; |
@@ -308,7 +308,7 @@ err: | |||
308 | 308 | ||
309 | static void __exit extlog_exit(void) | 309 | static void __exit extlog_exit(void) |
310 | { | 310 | { |
311 | set_edac_report_status(old_edac_report_status); | 311 | edac_set_report_status(old_edac_report_status); |
312 | mce_unregister_decode_chain(&extlog_mce_dec); | 312 | mce_unregister_decode_chain(&extlog_mce_dec); |
313 | ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN; | 313 | ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN; |
314 | if (extlog_l1_addr) | 314 | if (extlog_l1_addr) |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 536b65aa6fac..480072139b7a 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -57,20 +57,20 @@ static void const *edac_mc_owner; | |||
57 | 57 | ||
58 | static struct bus_type mc_bus[EDAC_MAX_MCS]; | 58 | static struct bus_type mc_bus[EDAC_MAX_MCS]; |
59 | 59 | ||
60 | int get_edac_report_status(void) | 60 | int edac_get_report_status(void) |
61 | { | 61 | { |
62 | return edac_report; | 62 | return edac_report; |
63 | } | 63 | } |
64 | EXPORT_SYMBOL_GPL(get_edac_report_status); | 64 | EXPORT_SYMBOL_GPL(edac_get_report_status); |
65 | 65 | ||
66 | void set_edac_report_status(int new) | 66 | void edac_set_report_status(int new) |
67 | { | 67 | { |
68 | if (new == EDAC_REPORTING_ENABLED || | 68 | if (new == EDAC_REPORTING_ENABLED || |
69 | new == EDAC_REPORTING_DISABLED || | 69 | new == EDAC_REPORTING_DISABLED || |
70 | new == EDAC_REPORTING_FORCE) | 70 | new == EDAC_REPORTING_FORCE) |
71 | edac_report = new; | 71 | edac_report = new; |
72 | } | 72 | } |
73 | EXPORT_SYMBOL_GPL(set_edac_report_status); | 73 | EXPORT_SYMBOL_GPL(edac_set_report_status); |
74 | 74 | ||
75 | static int edac_report_set(const char *str, const struct kernel_param *kp) | 75 | static int edac_report_set(const char *str, const struct kernel_param *kp) |
76 | { | 76 | { |
diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c index 928e0dba41fc..1cad5a9af8d0 100644 --- a/drivers/edac/pnd2_edac.c +++ b/drivers/edac/pnd2_edac.c | |||
@@ -1349,7 +1349,7 @@ static int pnd2_mce_check_error(struct notifier_block *nb, unsigned long val, vo | |||
1349 | struct dram_addr daddr; | 1349 | struct dram_addr daddr; |
1350 | char *type; | 1350 | char *type; |
1351 | 1351 | ||
1352 | if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | 1352 | if (edac_get_report_status() == EDAC_REPORTING_DISABLED) |
1353 | return NOTIFY_DONE; | 1353 | return NOTIFY_DONE; |
1354 | 1354 | ||
1355 | mci = pnd2_mci; | 1355 | mci = pnd2_mci; |
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index a65ea44e3b0b..ea21cb651b3c 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
@@ -3075,7 +3075,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val, | |||
3075 | struct sbridge_pvt *pvt; | 3075 | struct sbridge_pvt *pvt; |
3076 | char *type; | 3076 | char *type; |
3077 | 3077 | ||
3078 | if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | 3078 | if (edac_get_report_status() == EDAC_REPORTING_DISABLED) |
3079 | return NOTIFY_DONE; | 3079 | return NOTIFY_DONE; |
3080 | 3080 | ||
3081 | mci = get_mci_for_node_id(mce->socketid); | 3081 | mci = get_mci_for_node_id(mce->socketid); |
@@ -3441,7 +3441,7 @@ static int __init sbridge_init(void) | |||
3441 | 3441 | ||
3442 | if (rc >= 0) { | 3442 | if (rc >= 0) { |
3443 | mce_register_decode_chain(&sbridge_mce_dec); | 3443 | mce_register_decode_chain(&sbridge_mce_dec); |
3444 | if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | 3444 | if (edac_get_report_status() == EDAC_REPORTING_DISABLED) |
3445 | sbridge_printk(KERN_WARNING, "Loading driver, error reporting disabled.\n"); | 3445 | sbridge_printk(KERN_WARNING, "Loading driver, error reporting disabled.\n"); |
3446 | return 0; | 3446 | return 0; |
3447 | } | 3447 | } |
diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c index 1159dba4671f..64bef6c9cfb4 100644 --- a/drivers/edac/skx_edac.c +++ b/drivers/edac/skx_edac.c | |||
@@ -971,7 +971,7 @@ static int skx_mce_check_error(struct notifier_block *nb, unsigned long val, | |||
971 | struct mem_ctl_info *mci; | 971 | struct mem_ctl_info *mci; |
972 | char *type; | 972 | char *type; |
973 | 973 | ||
974 | if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | 974 | if (edac_get_report_status() == EDAC_REPORTING_DISABLED) |
975 | return NOTIFY_DONE; | 975 | return NOTIFY_DONE; |
976 | 976 | ||
977 | /* ignore unless this is memory related with an address */ | 977 | /* ignore unless this is memory related with an address */ |
diff --git a/include/linux/edac.h b/include/linux/edac.h index faf87e1eca21..8ae0f45fafd6 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h | |||
@@ -30,8 +30,8 @@ struct device; | |||
30 | extern int edac_op_state; | 30 | extern int edac_op_state; |
31 | 31 | ||
32 | struct bus_type *edac_get_sysfs_subsys(void); | 32 | struct bus_type *edac_get_sysfs_subsys(void); |
33 | int get_edac_report_status(void); | 33 | int edac_get_report_status(void); |
34 | void set_edac_report_status(int new); | 34 | void edac_set_report_status(int new); |
35 | 35 | ||
36 | enum { | 36 | enum { |
37 | EDAC_REPORTING_ENABLED, | 37 | EDAC_REPORTING_ENABLED, |