Skip to content

Commit

Permalink
EDAC: Rename report status accessors
Browse files Browse the repository at this point in the history
Change them to have the edac_ prefix.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
  • Loading branch information
Borislav Petkov committed Apr 10, 2017
1 parent fee27d7 commit bffc7de
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions drivers/acpi/acpi_extlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ static int __init extlog_init(void)
if (!(cap & MCG_ELOG_P) || !extlog_get_l1addr())
return -ENODEV;

if (get_edac_report_status() == EDAC_REPORTING_FORCE) {
if (edac_get_report_status() == EDAC_REPORTING_FORCE) {
pr_warn("Not loading eMCA, error reporting force-enabled through EDAC.\n");
return -EPERM;
}
Expand Down Expand Up @@ -285,8 +285,8 @@ static int __init extlog_init(void)
* eMCA event report method has higher priority than EDAC method,
* unless EDAC event report method is mandatory.
*/
old_edac_report_status = get_edac_report_status();
set_edac_report_status(EDAC_REPORTING_DISABLED);
old_edac_report_status = edac_get_report_status();
edac_set_report_status(EDAC_REPORTING_DISABLED);
mce_register_decode_chain(&extlog_mce_dec);
/* enable OS to be involved to take over management from BIOS */
((struct extlog_l1_head *)extlog_l1_addr)->flags |= FLAG_OS_OPTIN;
Expand All @@ -308,7 +308,7 @@ static int __init extlog_init(void)

static void __exit extlog_exit(void)
{
set_edac_report_status(old_edac_report_status);
edac_set_report_status(old_edac_report_status);
mce_unregister_decode_chain(&extlog_mce_dec);
((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN;
if (extlog_l1_addr)
Expand Down
8 changes: 4 additions & 4 deletions drivers/edac/edac_mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ static void const *edac_mc_owner;

static struct bus_type mc_bus[EDAC_MAX_MCS];

int get_edac_report_status(void)
int edac_get_report_status(void)
{
return edac_report;
}
EXPORT_SYMBOL_GPL(get_edac_report_status);
EXPORT_SYMBOL_GPL(edac_get_report_status);

void set_edac_report_status(int new)
void edac_set_report_status(int new)
{
if (new == EDAC_REPORTING_ENABLED ||
new == EDAC_REPORTING_DISABLED ||
new == EDAC_REPORTING_FORCE)
edac_report = new;
}
EXPORT_SYMBOL_GPL(set_edac_report_status);
EXPORT_SYMBOL_GPL(edac_set_report_status);

static int edac_report_set(const char *str, const struct kernel_param *kp)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/pnd2_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ static int pnd2_mce_check_error(struct notifier_block *nb, unsigned long val, vo
struct dram_addr daddr;
char *type;

if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
if (edac_get_report_status() == EDAC_REPORTING_DISABLED)
return NOTIFY_DONE;

mci = pnd2_mci;
Expand Down
4 changes: 2 additions & 2 deletions drivers/edac/sb_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -3075,7 +3075,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
struct sbridge_pvt *pvt;
char *type;

if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
if (edac_get_report_status() == EDAC_REPORTING_DISABLED)
return NOTIFY_DONE;

mci = get_mci_for_node_id(mce->socketid);
Expand Down Expand Up @@ -3441,7 +3441,7 @@ static int __init sbridge_init(void)

if (rc >= 0) {
mce_register_decode_chain(&sbridge_mce_dec);
if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
if (edac_get_report_status() == EDAC_REPORTING_DISABLED)
sbridge_printk(KERN_WARNING, "Loading driver, error reporting disabled.\n");
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/skx_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ static int skx_mce_check_error(struct notifier_block *nb, unsigned long val,
struct mem_ctl_info *mci;
char *type;

if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
if (edac_get_report_status() == EDAC_REPORTING_DISABLED)
return NOTIFY_DONE;

/* ignore unless this is memory related with an address */
Expand Down
4 changes: 2 additions & 2 deletions include/linux/edac.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ struct device;
extern int edac_op_state;

struct bus_type *edac_get_sysfs_subsys(void);
int get_edac_report_status(void);
void set_edac_report_status(int new);
int edac_get_report_status(void);
void edac_set_report_status(int new);

enum {
EDAC_REPORTING_ENABLED,
Expand Down

0 comments on commit bffc7de

Please sign in to comment.