| Message ID | 20200306151318.17422-4-rrichter@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EDAC/ghes: Cleanup, rework and improvement of memory reporting | expand |
On 06/03/2020 16:13, Robert Richter wrote: > The local variable rdr_mask serves as a static constant here. It hides > what the code is doing. Remove it and replace it with the actual logic > that checks some bits. > > Signed-off-by: Robert Richter <rrichter@marvell.com> Reviewed-by: Matthias Brugger <mbrugger@suse.com> > --- > drivers/edac/ghes_edac.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c > index 07fa3867cba1..fce53893731a 100644 > --- a/drivers/edac/ghes_edac.c > +++ b/drivers/edac/ghes_edac.c > @@ -123,7 +123,6 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) > if (dh->type == DMI_ENTRY_MEM_DEVICE) { > struct memdev_dmi_entry *entry = (struct memdev_dmi_entry *)dh; > struct dimm_info *dimm = edac_get_dimm(mci, dimm_fill->count, 0, 0); > - u16 rdr_mask = BIT(7) | BIT(13); > > if (entry->size == 0xffff) { > pr_info("Can't get DIMM%i size\n", > @@ -173,7 +172,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) > default: > if (entry->type_detail & BIT(6)) > dimm->mtype = MEM_RMBS; > - else if ((entry->type_detail & rdr_mask) == rdr_mask) > + else if ((entry->type_detail & BIT(7)) && > + (entry->type_detail & BIT(13))) > dimm->mtype = MEM_RDR; > else if (entry->type_detail & BIT(7)) > dimm->mtype = MEM_SDR; >
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 07fa3867cba1..fce53893731a 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -123,7 +123,6 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) if (dh->type == DMI_ENTRY_MEM_DEVICE) { struct memdev_dmi_entry *entry = (struct memdev_dmi_entry *)dh; struct dimm_info *dimm = edac_get_dimm(mci, dimm_fill->count, 0, 0); - u16 rdr_mask = BIT(7) | BIT(13); if (entry->size == 0xffff) { pr_info("Can't get DIMM%i size\n", @@ -173,7 +172,8 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) default: if (entry->type_detail & BIT(6)) dimm->mtype = MEM_RMBS; - else if ((entry->type_detail & rdr_mask) == rdr_mask) + else if ((entry->type_detail & BIT(7)) && + (entry->type_detail & BIT(13))) dimm->mtype = MEM_RDR; else if (entry->type_detail & BIT(7)) dimm->mtype = MEM_SDR;
The local variable rdr_mask serves as a static constant here. It hides what the code is doing. Remove it and replace it with the actual logic that checks some bits. Signed-off-by: Robert Richter <rrichter@marvell.com> --- drivers/edac/ghes_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)