From: Andrew Davis <afd@ti.com>
To: Bjorn Andersson <andersson@kernel.org>,
Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: <linux-omap@vger.kernel.org>, <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Andrew Davis <afd@ti.com>
Subject: [PATCH 3/4] hwspinlock: omap: Use devm_hwspin_lock_register() helper
Date: Tue, 23 Jan 2024 10:04:04 -0600 [thread overview]
Message-ID: <20240123160405.360437-3-afd@ti.com> (raw)
In-Reply-To: <20240123160405.360437-1-afd@ti.com>
This unregister the HW spinlock on module exit, allowing us to
remove the remove callback. Do this here.
Signed-off-by: Andrew Davis <afd@ti.com>
---
drivers/hwspinlock/omap_hwspinlock.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/drivers/hwspinlock/omap_hwspinlock.c b/drivers/hwspinlock/omap_hwspinlock.c
index 2f18ea6c05e3f..1b0a1bea2b24a 100644
--- a/drivers/hwspinlock/omap_hwspinlock.c
+++ b/drivers/hwspinlock/omap_hwspinlock.c
@@ -117,12 +117,10 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
if (!bank)
return -ENOMEM;
- platform_set_drvdata(pdev, bank);
-
for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
hwlock->priv = io_base + LOCK_BASE_OFFSET + sizeof(u32) * i;
- ret = hwspin_lock_register(bank, &pdev->dev, &omap_hwspinlock_ops,
+ ret = devm_hwspin_lock_register(&pdev->dev, bank, &omap_hwspinlock_ops,
base_id, num_locks);
if (ret)
return ret;
@@ -133,18 +131,6 @@ static int omap_hwspinlock_probe(struct platform_device *pdev)
return 0;
}
-static void omap_hwspinlock_remove(struct platform_device *pdev)
-{
- struct hwspinlock_device *bank = platform_get_drvdata(pdev);
- int ret;
-
- ret = hwspin_lock_unregister(bank);
- if (ret) {
- dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
- return;
- }
-}
-
static const struct of_device_id omap_hwspinlock_of_match[] = {
{ .compatible = "ti,omap4-hwspinlock", },
{ .compatible = "ti,am64-hwspinlock", },
@@ -155,7 +141,6 @@ MODULE_DEVICE_TABLE(of, omap_hwspinlock_of_match);
static struct platform_driver omap_hwspinlock_driver = {
.probe = omap_hwspinlock_probe,
- .remove_new = omap_hwspinlock_remove,
.driver = {
.name = "omap_hwspinlock",
.of_match_table = omap_hwspinlock_of_match,
--
2.39.2
next prev parent reply other threads:[~2024-01-23 16:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 16:04 [PATCH 1/4] hwspinlock: omap: Remove unneeded check for OF node Andrew Davis
2024-01-23 16:04 ` [PATCH 2/4] hwspinlock: omap: Use devm_pm_runtime_enable() helper Andrew Davis
2024-02-06 19:06 ` Bjorn Andersson
2024-02-06 19:07 ` Andrew Davis
2024-01-23 16:04 ` Andrew Davis [this message]
2024-02-06 19:02 ` [PATCH 3/4] hwspinlock: omap: Use devm_hwspin_lock_register() helper Bjorn Andersson
2024-01-23 16:04 ` [PATCH 4/4] hwspinlock: omap: Use index to get hwspinlock pointer Andrew Davis
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=20240123160405.360437-3-afd@ti.com \
--to=afd@ti.com \
--cc=andersson@kernel.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.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