aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Temerkhanov <s.temerkhanov@gmail.com>2017-04-06 07:38:34 -0400
committerBorislav Petkov <bp@suse.de>2017-04-07 05:49:32 -0400
commit5195c206fda39a10d946505d95ec653e2b83a8ab (patch)
treed1f9edb574b790a2fd85a573216137f37f0f12b5
parent3d2d8c0f84ca518da9210b3f855643efd1629e07 (diff)
EDAC, thunderx: Remove unused code
Remove unused code reserved for upcoming CPUs. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sergey Temerkhanov <s.temerkhanov@gmail.com> Cc: David Daney <david.daney@cavium.com> Cc: Jan.Glauber@cavium.com Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20170406113834.17153-1-s.temerkhanov@gmail.com Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r--drivers/edac/thunderx_edac.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c
index 955f73cdd5fd..86d585cb6d32 100644
--- a/drivers/edac/thunderx_edac.c
+++ b/drivers/edac/thunderx_edac.c
@@ -864,8 +864,6 @@ static struct pci_driver thunderx_lmc_driver = {
864#define OCX_COM_WIN_REQ_TOUT BIT(50) 864#define OCX_COM_WIN_REQ_TOUT BIT(50)
865#define OCX_COM_RX_LANE GENMASK(23, 0) 865#define OCX_COM_RX_LANE GENMASK(23, 0)
866 866
867#define OCX_COM_INT_UE (0)
868
869#define OCX_COM_INT_CE (OCX_COM_IO_BADID | \ 867#define OCX_COM_INT_CE (OCX_COM_IO_BADID | \
870 OCX_COM_MEM_BADID | \ 868 OCX_COM_MEM_BADID | \
871 OCX_COM_COPR_BADID | \ 869 OCX_COM_COPR_BADID | \
@@ -1175,9 +1173,7 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(int irq, void *irq_id)
1175 strncat(msg, other, OCX_MESSAGE_SIZE); 1173 strncat(msg, other, OCX_MESSAGE_SIZE);
1176 } 1174 }
1177 1175
1178 if (ctx->reg_com_int & OCX_COM_INT_UE) 1176 if (ctx->reg_com_int & OCX_COM_INT_CE)
1179 edac_device_handle_ue(ocx->edac_dev, 0, 0, msg);
1180 else if (ctx->reg_com_int & OCX_COM_INT_CE)
1181 edac_device_handle_ce(ocx->edac_dev, 0, 0, msg); 1177 edac_device_handle_ce(ocx->edac_dev, 0, 0, msg);
1182 1178
1183 ocx->com_ring_tail++; 1179 ocx->com_ring_tail++;
@@ -1645,14 +1641,12 @@ static const struct error_descr l2_tad_errors[] = {
1645 1641
1646#define L2C_TAD_INT_RTG (L2C_TAD_INT_RTGDBE) 1642#define L2C_TAD_INT_RTG (L2C_TAD_INT_RTGDBE)
1647 1643
1648#define L2C_TAD_INT_NXM (0)
1649
1650#define L2C_TAD_INT_DISLMC (L2C_TAD_INT_WRDISLMC | L2C_TAD_INT_RDDISLMC) 1644#define L2C_TAD_INT_DISLMC (L2C_TAD_INT_WRDISLMC | L2C_TAD_INT_RDDISLMC)
1651 1645
1652#define L2C_TAD_INT_DISOCI (L2C_TAD_INT_WRDISOCI | L2C_TAD_INT_RDDISOCI) 1646#define L2C_TAD_INT_DISOCI (L2C_TAD_INT_WRDISOCI | L2C_TAD_INT_RDDISOCI)
1653 1647
1654#define L2C_TAD_INT_ENA_ALL (L2C_TAD_INT_ECC | L2C_TAD_INT_TAG | \ 1648#define L2C_TAD_INT_ENA_ALL (L2C_TAD_INT_ECC | L2C_TAD_INT_TAG | \
1655 L2C_TAD_INT_RTG | L2C_TAD_INT_NXM | \ 1649 L2C_TAD_INT_RTG | \
1656 L2C_TAD_INT_DISLMC | L2C_TAD_INT_DISOCI | \ 1650 L2C_TAD_INT_DISLMC | L2C_TAD_INT_DISOCI | \
1657 L2C_TAD_INT_LFBTO) 1651 L2C_TAD_INT_LFBTO)
1658 1652
@@ -1803,9 +1797,6 @@ static irqreturn_t thunderx_l2c_tad_isr(int irq, void *irq_id)
1803 } else if (ctx->reg_int & L2C_TAD_INT_TAG) { 1797 } else if (ctx->reg_int & L2C_TAD_INT_TAG) {
1804 ctx->reg_ext_name = "TTG_ERR"; 1798 ctx->reg_ext_name = "TTG_ERR";
1805 ctx->reg_ext = readq(tad->regs + L2C_TAD_TTG_ERR); 1799 ctx->reg_ext = readq(tad->regs + L2C_TAD_TTG_ERR);
1806 } else if (ctx->reg_int & L2C_TAD_INT_NXM) {
1807 ctx->reg_ext_name = "ERR";
1808 ctx->reg_ext = readq(tad->regs + L2C_TAD_ERR);
1809 } else if (ctx->reg_int & L2C_TAD_INT_LFBTO) { 1800 } else if (ctx->reg_int & L2C_TAD_INT_LFBTO) {
1810 ctx->reg_ext_name = "TIMEOUT"; 1801 ctx->reg_ext_name = "TIMEOUT";
1811 ctx->reg_ext = readq(tad->regs + L2C_TAD_TIMEOUT); 1802 ctx->reg_ext = readq(tad->regs + L2C_TAD_TIMEOUT);