From: Borislav Petkov <bp@alien8.de>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-edac <linux-edac@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/4] EDAC: Remove edac_get_dimm_by_index()
Date: Tue, 16 Jun 2020 19:27:37 +0200 [thread overview]
Message-ID: <20200616172737.30171-5-bp@alien8.de> (raw)
In-Reply-To: <20200616172737.30171-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
It is unused now.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
include/linux/edac.h | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 6eb7d55d7c3d..15e8f3d8a895 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -594,27 +594,6 @@ struct mem_ctl_info {
? (mci)->dimms[(dimm)->idx + 1] \
: NULL)
-/**
- * edac_get_dimm_by_index - Get DIMM info at @index from a memory
- * controller
- *
- * @mci: MC descriptor struct mem_ctl_info
- * @index: index in the memory controller's DIMM array
- *
- * Returns a struct dimm_info * or NULL on failure.
- */
-static inline struct dimm_info *
-edac_get_dimm_by_index(struct mem_ctl_info *mci, int index)
-{
- if (index < 0 || index >= mci->tot_dimms)
- return NULL;
-
- if (WARN_ON_ONCE(mci->dimms[index]->idx != index))
- return NULL;
-
- return mci->dimms[index];
-}
-
/**
* edac_get_dimm - Get DIMM info from a memory controller given by
* [layer0,layer1,layer2] position
@@ -650,6 +629,12 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci,
if (mci->n_layers > 2)
index = index * mci->layers[2].size + layer2;
- return edac_get_dimm_by_index(mci, index);
+ if (index < 0 || index >= mci->tot_dimms)
+ return NULL;
+
+ if (WARN_ON_ONCE(mci->dimms[index]->idx != index))
+ return NULL;
+
+ return mci->dimms[index];
}
#endif /* _LINUX_EDAC_H_ */
--
2.21.0
next prev parent reply other threads:[~2020-06-16 17:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 17:27 [PATCH 0/4] EDAC/ghes: Some cleanups Borislav Petkov
2020-06-16 17:27 ` [PATCH 1/4] EDAC/ghes: Setup DIMM label from DMI and use it in error reports Borislav Petkov
2020-06-16 17:27 ` [PATCH 2/4] EDAC/ghes: Remove unused members of struct ghes_edac_pvt, rename it to ghes_pvt Borislav Petkov
2020-06-16 17:27 ` [PATCH 3/4] EDAC/ghes: Scan the system once on driver init Borislav Petkov
2020-06-16 17:27 ` Borislav Petkov [this message]
2020-06-22 15:09 ` [PATCH 0/4] EDAC/ghes: Some cleanups 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=20200616172737.30171-5-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@infradead.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;
as well as URLs for NNTP newsgroup(s).