Commit 323014d8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

EDAC: sb_edac: get rid of unused vars 



There are several vars unused on this driver, probably because
it was a modified copy of another driver. Get rid of them.

	drivers/edac/sb_edac.c: In function ‘knl_get_dimm_capacity’:
	drivers/edac/sb_edac.c:1343:16: warning: variable ‘sad_size’ set but not used [-Wunused-but-set-variable]
	 1343 |  u64 sad_base, sad_size, sad_limit = 0;
	      |                ^~~~~~~~
	drivers/edac/sb_edac.c: In function ‘sbridge_mce_output_error’:
	drivers/edac/sb_edac.c:2955:8: warning: variable ‘type’ set but not used [-Wunused-but-set-variable]
	 2955 |  char *type, *optype, msg[256];
	      |        ^~~~
	drivers/edac/sb_edac.c: In function ‘sbridge_unregister_mci’:
	drivers/edac/sb_edac.c:3203:22: warning: variable ‘pvt’ set but not used [-Wunused-but-set-variable]
	 3203 |  struct sbridge_pvt *pvt;
	      |                      ^~~
	At top level:
	drivers/edac/sb_edac.c:266:18: warning: ‘correrrthrsld’ defined but not used [-Wunused-const-variable=]
	  266 | static const u32 correrrthrsld[] = {
	      |                  ^~~~~~~~~~~~~
	drivers/edac/sb_edac.c:257:18: warning: ‘correrrcnt’ defined but not used [-Wunused-const-variable=]
	  257 | static const u32 correrrcnt[] = {
	      |                  ^~~~~~~~~~

Acked-by: default avatarBorislav Petkov <bp@alien8.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent bb66f867

drivers/edac/sb_edac.c

+8 −13
Original line number Diff line number Diff line
@@ -254,18 +254,20 @@ static const u32 rir_offset[MAX_RIR_RANGES][MAX_RIR_WAY] = { 
 * FIXME: Implement the error count reads directly

 */



static const u32 correrrcnt[] = {

	0x104, 0x108, 0x10c, 0x110,

};



#define RANK_ODD_OV(reg)		GET_BITFIELD(reg, 31, 31)

#define RANK_ODD_ERR_CNT(reg)		GET_BITFIELD(reg, 16, 30)

#define RANK_EVEN_OV(reg)		GET_BITFIELD(reg, 15, 15)

#define RANK_EVEN_ERR_CNT(reg)		GET_BITFIELD(reg,  0, 14)



#if 0 /* Currently unused*/

static const u32 correrrcnt[] = {

	0x104, 0x108, 0x10c, 0x110,

};



static const u32 correrrthrsld[] = {

	0x11c, 0x120, 0x124, 0x128,

};

#endif



#define RANK_ODD_ERR_THRSLD(reg)	GET_BITFIELD(reg, 16, 30)

#define RANK_EVEN_ERR_THRSLD(reg)	GET_BITFIELD(reg,  0, 14)
@@ -1340,7 +1342,7 @@ static void knl_show_mc_route(u32 reg, char *s) 
 */

static int knl_get_dimm_capacity(struct sbridge_pvt *pvt, u64 *mc_sizes)

{

	u64 sad_base, sad_size, sad_limit = 0;

	u64 sad_base, sad_limit = 0;

	u64 tad_base, tad_size, tad_limit, tad_deadspace, tad_livespace;

	int sad_rule = 0;

	int tad_rule = 0;
@@ -1427,7 +1429,6 @@ static int knl_get_dimm_capacity(struct sbridge_pvt *pvt, u64 *mc_sizes) 
		edram_only = KNL_EDRAM_ONLY(dram_rule);



		sad_limit = pvt->info.sad_limit(dram_rule)+1;

		sad_size = sad_limit - sad_base;



		pci_read_config_dword(pvt->pci_sad0,

			pvt->info.interleave_list[sad_rule], &interleave_reg);
@@ -2952,7 +2953,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, 
	struct mem_ctl_info *new_mci;

	struct sbridge_pvt *pvt = mci->pvt_info;

	enum hw_event_mc_err_type tp_event;

	char *type, *optype, msg[256];

	char *optype, msg[256];

	bool ripv = GET_BITFIELD(m->mcgstatus, 0, 0);

	bool overflow = GET_BITFIELD(m->status, 62, 62);

	bool uncorrected_error = GET_BITFIELD(m->status, 61, 61);
@@ -2981,14 +2982,11 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, 
	if (uncorrected_error) {

		core_err_cnt = 1;

		if (ripv) {

			type = "FATAL";

			tp_event = HW_EVENT_ERR_FATAL;

		} else {

			type = "NON_FATAL";

			tp_event = HW_EVENT_ERR_UNCORRECTED;

		}

	} else {

		type = "CORRECTED";

		tp_event = HW_EVENT_ERR_CORRECTED;

	}
@@ -3200,7 +3198,6 @@ static struct notifier_block sbridge_mce_dec = { 
static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)

{

	struct mem_ctl_info *mci = sbridge_dev->mci;

	struct sbridge_pvt *pvt;



	if (unlikely(!mci || !mci->pvt_info)) {

		edac_dbg(0, "MC: dev = %p\n", &sbridge_dev->pdev[0]->dev);
@@ -3209,8 +3206,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev) 
		return;

	}



	pvt = mci->pvt_info;



	edac_dbg(0, "MC: mci = %p, dev = %p\n",

		 mci, &sbridge_dev->pdev[0]->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE