aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-02-24 11:13:58 -0500
committerBorislav Petkov <bp@suse.de>2014-02-25 04:22:34 -0500
commitf118920baf5994dfa8a5a66322892731480a8207 (patch)
tree7b17f80ed446a714564e11029aa73c39e3971b51 /drivers/edac
parent5fdae419009764337c8f2bf143af57dcadfd228d (diff)
i7core_edac: Drop unused variable
Fix the following warning: drivers/edac/i7core_edac.c: In function "core_mce_output_error": drivers/edac/i7core_edac.c:1711:8: warning: variable "type" set but not used [-Wunused-but-set-variable] char *type, *optype, *err; ^ According to Mauro, type can just be dropped, as tp_event now maps if the error is corrected, uncorrected non-fatal or uncorrected fatal one. Signed-off-by: Jean Delvare <jdelvare@suse.de> Link: http://lkml.kernel.org/r/20140224171358.692d7e5a@endymion.delvare Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Cc: Doug Thompson <dougthompson@xmission.com> Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/i7core_edac.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 87533ca7752e..cc6a51074225 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -1703,7 +1703,7 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
1703 const struct mce *m) 1703 const struct mce *m)
1704{ 1704{
1705 struct i7core_pvt *pvt = mci->pvt_info; 1705 struct i7core_pvt *pvt = mci->pvt_info;
1706 char *type, *optype, *err; 1706 char *optype, *err;
1707 enum hw_event_mc_err_type tp_event; 1707 enum hw_event_mc_err_type tp_event;
1708 unsigned long error = m->status & 0x1ff0000l; 1708 unsigned long error = m->status & 0x1ff0000l;
1709 bool uncorrected_error = m->mcgstatus & 1ll << 61; 1709 bool uncorrected_error = m->mcgstatus & 1ll << 61;
@@ -1716,15 +1716,11 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
1716 u32 errnum = find_first_bit(&error, 32); 1716 u32 errnum = find_first_bit(&error, 32);
1717 1717
1718 if (uncorrected_error) { 1718 if (uncorrected_error) {
1719 if (ripv) { 1719 if (ripv)
1720 type = "FATAL";
1721 tp_event = HW_EVENT_ERR_FATAL; 1720 tp_event = HW_EVENT_ERR_FATAL;
1722 } else { 1721 else
1723 type = "NON_FATAL";
1724 tp_event = HW_EVENT_ERR_UNCORRECTED; 1722 tp_event = HW_EVENT_ERR_UNCORRECTED;
1725 }
1726 } else { 1723 } else {
1727 type = "CORRECTED";
1728 tp_event = HW_EVENT_ERR_CORRECTED; 1724 tp_event = HW_EVENT_ERR_CORRECTED;
1729 } 1725 }
1730 1726