From: leo.yan@linaro.org (Leo Yan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] ALSA: AACI: Convert to use devm_ioremap_resource()
Date: Sun, 26 Mar 2017 22:41:54 +0800 [thread overview]
Message-ID: <1490539314-9681-6-git-send-email-leo.yan@linaro.org> (raw)
In-Reply-To: <1490539314-9681-1-git-send-email-leo.yan@linaro.org>
Convert to use devm_ioremap_resource() in probe function, otherwise it's
missed to unremap this region if probe failed or rmmod module.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
sound/arm/aaci.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 4140b1b..2078568 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -990,19 +990,13 @@ static int aaci_probe(struct amba_device *dev,
struct aaci *aaci;
int ret, i;
- ret = amba_request_regions(dev, NULL);
- if (ret)
- return ret;
-
aaci = aaci_init_card(dev);
- if (!aaci) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!aaci)
+ return -ENOMEM;
- aaci->base = ioremap(dev->res.start, resource_size(&dev->res));
- if (!aaci->base) {
- ret = -ENOMEM;
+ aaci->base = devm_ioremap_resource(&dev->dev, &dev->res);
+ if (IS_ERR(aaci->base)) {
+ ret = PTR_ERR(aaci->base);
goto out;
}
@@ -1064,9 +1058,7 @@ static int aaci_probe(struct amba_device *dev,
}
out:
- if (aaci)
- snd_card_free(aaci->card);
- amba_release_regions(dev);
+ snd_card_free(aaci->card);
return ret;
}
@@ -1079,7 +1071,6 @@ static int aaci_remove(struct amba_device *dev)
writel(0, aaci->base + AACI_MAINCR);
snd_card_free(card);
- amba_release_regions(dev);
}
return 0;
--
2.7.4
next prev parent reply other threads:[~2017-03-26 14:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-26 14:41 [PATCH 0/5] Convert to use devm_*() for amba attached modules Leo Yan
2017-03-26 14:41 ` [PATCH 1/5] Input: ambakmi - Convert to use devm_*() Leo Yan
2017-03-26 14:50 ` Russell King - ARM Linux
2017-03-26 15:23 ` Leo Yan
2017-03-26 14:41 ` [PATCH 2/5] drivers/rtc/rtc-pl030.c: " Leo Yan
2017-03-29 1:45 ` Linus Walleij
2017-03-26 14:41 ` [PATCH 3/5] drivers/rtc/rtc-pl031.c: " Leo Yan
2017-03-29 1:46 ` Linus Walleij
2017-03-26 14:41 ` [PATCH 4/5] vfio: platform: " Leo Yan
2017-04-02 14:45 ` Auger Eric
2017-04-06 14:17 ` Leo Yan
2017-03-26 14:41 ` Leo Yan [this message]
2017-03-26 14:54 ` [PATCH 5/5] ALSA: AACI: Convert to use devm_ioremap_resource() Russell King - ARM Linux
2017-03-26 15:20 ` [PATCH 0/5] Convert to use devm_*() for amba attached modules Alexandre Belloni
2017-03-26 15:38 ` Leo Yan
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=1490539314-9681-6-git-send-email-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.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).