From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: richard.gong@linux.intel.com, gregkh@linuxfoundation.org,
atull@kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: [PATCH 2/4 v2] firmware: stratix10-svc: Unmap some previously memremap'ed memory
Date: Wed, 29 Apr 2020 08:52:43 +0200 [thread overview]
Message-ID: <43505dc3a4b405d1c7d4a0fa74c67eda3e8bdb75.1588142343.git.christophe.jaillet@wanadoo.fr> (raw)
In-Reply-To: <cover.1588142343.git.christophe.jaillet@wanadoo.fr>
In 'svc_create_memory_pool()' we memremap some memory. This has to be
undone in case of error and if the driver is removed.
The easiest way to do it is to use 'devm_memremap()'.
Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/firmware/stratix10-svc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 3a176e62754a..de5870f76c5e 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -631,7 +631,7 @@ svc_create_memory_pool(struct platform_device *pdev,
end = rounddown(sh_memory->addr + sh_memory->size, PAGE_SIZE);
paddr = begin;
size = end - begin;
- va = memremap(paddr, size, MEMREMAP_WC);
+ va = devm_memremap(dev, paddr, size, MEMREMAP_WC);
if (!va) {
dev_err(dev, "fail to remap shared memory\n");
return ERR_PTR(-EINVAL);
--
2.25.1
next prev parent reply other threads:[~2020-04-29 6:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 6:52 [PATCH 0/4 v2] firmware: stratix10-svc: Fix some error handling code Christophe JAILLET
2020-04-29 6:52 ` [PATCH 1/4 v2] firmware: stratix10-svc: Fix genpool creation error handling Christophe JAILLET
2020-04-29 6:52 ` Christophe JAILLET [this message]
2020-05-05 14:43 ` [PATCH 2/4 v2] firmware: stratix10-svc: Unmap some previously memremap'ed memory Greg KH
2020-05-05 15:09 ` Christophe JAILLET
2020-04-29 6:52 ` [PATCH 3/4 v2] firmware: stratix10-svc: Fix some error handling paths in 'stratix10_svc_drv_probe()' Christophe JAILLET
2020-05-05 14:02 ` Richard Gong
2020-05-05 15:15 ` Christophe JAILLET
2020-06-26 19:37 ` [PATCH V3] firmware: stratix10-svc: Fix some error handling code Christophe JAILLET
2020-06-27 5:15 ` Greg KH
2020-06-27 5:15 ` Greg KH
2020-06-27 7:31 ` Marion & Christophe JAILLET
2020-06-27 8:03 ` Greg KH
2020-04-29 6:52 ` [PATCH 4/4 v2] firmware: stratix10-svc: Slightly simplify code Christophe JAILLET
2020-05-01 15:40 ` Richard Gong
2020-05-01 15:48 ` Christophe JAILLET
2020-05-01 16:55 ` Richard Gong
2020-05-02 8:49 ` Christophe JAILLET
2020-05-05 14:18 ` Richard Gong
2020-05-06 10:04 ` Dan Carpenter
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=43505dc3a4b405d1c7d4a0fa74c67eda3e8bdb75.1588142343.git.christophe.jaillet@wanadoo.fr \
--to=christophe.jaillet@wanadoo.fr \
--cc=atull@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=richard.gong@linux.intel.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 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).