From: Borislav Petkov <bp@alien8.de>
To: linux-edac <linux-edac@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 04/11] EDAC: Remove edac_err_assert
Date: Thu, 6 Apr 2017 11:06:27 +0200 [thread overview]
Message-ID: <20170406090634.30950-5-bp@alien8.de> (raw)
In-Reply-To: <20170406090634.30950-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
... and the glue around it. It is not needed anymore.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
drivers/edac/edac_mc.c | 18 +-----------------
drivers/edac/edac_stub.c | 3 ---
include/linux/edac.h | 1 -
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 824d31193b69..482b6aea1ce7 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -505,22 +505,6 @@ struct mem_ctl_info *find_mci_by_dev(struct device *dev)
EXPORT_SYMBOL_GPL(find_mci_by_dev);
/*
- * handler for EDAC to check if NMI type handler has asserted interrupt
- */
-static int edac_mc_assert_error_check_and_clear(void)
-{
- int old_state;
-
- if (edac_op_state == EDAC_OPSTATE_POLL)
- return 1;
-
- old_state = edac_err_assert;
- edac_err_assert = 0;
-
- return old_state;
-}
-
-/*
* edac_mc_workq_function
* performs the operation scheduled by a workq request
*/
@@ -536,7 +520,7 @@ static void edac_mc_workq_function(struct work_struct *work_req)
return;
}
- if (edac_mc_assert_error_check_and_clear())
+ if (edac_op_state == EDAC_OPSTATE_POLL)
mci->edac_check(mci);
mutex_unlock(&mem_ctls_mutex);
diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c
index cfb250fa38ce..f02d21d8130f 100644
--- a/drivers/edac/edac_stub.c
+++ b/drivers/edac/edac_stub.c
@@ -20,9 +20,6 @@
int edac_op_state = EDAC_OPSTATE_INVAL;
EXPORT_SYMBOL_GPL(edac_op_state);
-int edac_err_assert = 0;
-EXPORT_SYMBOL_GPL(edac_err_assert);
-
int edac_report_status = EDAC_REPORTING_ENABLED;
EXPORT_SYMBOL_GPL(edac_report_status);
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 9fd6fe53ab2a..c55e93975079 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -28,7 +28,6 @@ struct device;
#define EDAC_OPSTATE_INT 2
extern int edac_op_state;
-extern int edac_err_assert;
extern struct bus_type *edac_get_sysfs_subsys(void);
--
2.11.0
next prev parent reply other threads:[~2017-04-06 9:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 9:06 [PATCH 00/11] EDAC: Remove edac_stub.c Borislav Petkov
2017-04-06 9:06 ` [PATCH 01/11] EDAC, highbank: Align Makefile directives Borislav Petkov
2017-04-06 9:06 ` [PATCH 02/11] x86/nmi, EDAC: Get rid of DRAM error reporting thru PCI SERR NMI Borislav Petkov
2017-04-10 13:39 ` Thomas Gleixner
2017-04-10 14:59 ` Borislav Petkov
2017-04-06 9:06 ` [PATCH 03/11] EDAC: Get rid of edac_handlers Borislav Petkov
2017-04-06 9:06 ` Borislav Petkov [this message]
2017-04-06 9:06 ` [PATCH 05/11] EDAC: Move edac_op_state to edac_mc.c Borislav Petkov
2017-04-06 9:06 ` [PATCH 06/11] ACPI/extlog: Add EDAC dependency Borislav Petkov
2017-04-06 9:06 ` [PATCH 07/11] EDAC: Issue tracepoint only when it is defined Borislav Petkov
2017-04-06 9:06 ` [PATCH 08/11] EDAC: Remove EDAC_MM_EDAC Borislav Petkov
2017-04-06 9:06 ` [PATCH 09/11] EDAC: Update Kconfig help text Borislav Petkov
2017-04-06 9:06 ` [PATCH 10/11] EDAC: Delete edac_stub.c Borislav Petkov
2017-04-06 9:06 ` [PATCH 11/11] EDAC: Rename report status accessors Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170406090634.30950-5-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox