From: Jarkko Sakkinen <jarkko@kernel.org>
To: linux-integrity@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
Peter Huewe <peterhuewe@gmx.de>, Jason Gunthorpe <jgg@ziepe.ca>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Stuart Yoder <stuart.yoder@arm.com>,
Chu Guangqing <chuguangqing@inspur.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] tpm_crb: Remove dead code from crb_map_res()
Date: Tue, 1 Sep 2026 17:29:46 +0300 [thread overview]
Message-ID: <20260901142955.187856-1-jarkko@kernel.org> (raw)
In all the pre-existing call sites both @iomem and @iobase_ptr are
either NULL or non-NULL.
Thus, add invariant for this and remove a dead basic block.
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
drivers/char/tpm/tpm_crb.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index ceb4100ba400..e7a61f36c58b 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -570,15 +570,12 @@ static void __iomem *crb_map_res(struct device *dev, struct resource *iores,
if (start != new_res.start)
return IOMEM_ERR_PTR(-EINVAL);
+ if ((iores == NULL) != (iobase_ptr == NULL))
+ return IOMEM_ERR_PTR(-EINVAL);
+
if (!iores)
return devm_ioremap_resource(dev, &new_res);
- if (!*iobase_ptr) {
- *iobase_ptr = devm_ioremap_resource(dev, iores);
- if (IS_ERR(*iobase_ptr))
- return *iobase_ptr;
- }
-
return *iobase_ptr + (new_res.start - iores->start);
}
--
2.47.3
next reply other threads:[~2026-09-01 14:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 14:29 Jarkko Sakkinen [this message]
2026-09-01 16:06 ` [PATCH] tpm_crb: Remove dead code from crb_map_res() Stefano Garzarella
2026-09-01 16:55 ` Jarkko Sakkinen
2026-09-02 8:54 ` Stefano Garzarella
2026-09-09 16:01 ` Jarkko Sakkinen
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=20260901142955.187856-1-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=chuguangqing@inspur.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=rafael.j.wysocki@intel.com \
--cc=stuart.yoder@arm.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.