From: Moritz Fischer <mdf@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-fpga@vger.kernel.org, Moritz Fischer <mdf@kernel.org>,
Russ Weight <russell.h.weight@intel.com>,
Xu Yilun <yilun.xu@intel.com>
Subject: [PATCH 6/8] fpga: mgr: Use standard dev_release for class driver
Date: Mon, 14 Jun 2021 10:09:07 -0700 [thread overview]
Message-ID: <20210614170909.232415-7-mdf@kernel.org> (raw)
In-Reply-To: <20210614170909.232415-1-mdf@kernel.org>
From: Russ Weight <russell.h.weight@intel.com>
The FPGA manager class driver data structure is being treated as a
managed resource instead of using the class.dev_release call-back
function to release the class data structure. This change populates
the class.dev_release function, changes the fpga_mgr_free() function
to call put_device() and changes the fpga_mgr_unregister() function
to call device_del() instead of device_unregister().
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
Reviewed-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
drivers/fpga/fpga-mgr.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 42ddc0844781..9f6c3760b6ff 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -585,8 +585,10 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name,
return NULL;
id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
- if (id < 0)
- goto error_kfree;
+ if (id < 0) {
+ kfree(mgr);
+ return NULL;
+ }
mutex_init(&mgr->ref_mutex);
@@ -602,17 +604,12 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name,
mgr->dev.id = id;
ret = dev_set_name(&mgr->dev, "fpga%d", id);
- if (ret)
- goto error_device;
+ if (ret) {
+ put_device(&mgr->dev);
+ return NULL;
+ }
return mgr;
-
-error_device:
- ida_simple_remove(&fpga_mgr_ida, id);
-error_kfree:
- kfree(mgr);
-
- return NULL;
}
EXPORT_SYMBOL_GPL(fpga_mgr_create);
@@ -622,8 +619,7 @@ EXPORT_SYMBOL_GPL(fpga_mgr_create);
*/
void fpga_mgr_free(struct fpga_manager *mgr)
{
- ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
- kfree(mgr);
+ put_device(&mgr->dev);
}
EXPORT_SYMBOL_GPL(fpga_mgr_free);
@@ -692,16 +688,11 @@ int fpga_mgr_register(struct fpga_manager *mgr)
ret = device_add(&mgr->dev);
if (ret)
- goto error_device;
+ return ret;
dev_info(&mgr->dev, "%s registered\n", mgr->name);
return 0;
-
-error_device:
- ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
-
- return ret;
}
EXPORT_SYMBOL_GPL(fpga_mgr_register);
@@ -722,7 +713,7 @@ void fpga_mgr_unregister(struct fpga_manager *mgr)
if (mgr->mops->fpga_remove)
mgr->mops->fpga_remove(mgr);
- device_unregister(&mgr->dev);
+ device_del(&mgr->dev);
}
EXPORT_SYMBOL_GPL(fpga_mgr_unregister);
@@ -781,6 +772,10 @@ EXPORT_SYMBOL_GPL(devm_fpga_mgr_register);
static void fpga_mgr_dev_release(struct device *dev)
{
+ struct fpga_manager *mgr = to_fpga_manager(dev);
+
+ ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
+ kfree(mgr);
}
static int __init fpga_mgr_class_init(void)
--
2.31.1
next prev parent reply other threads:[~2021-06-14 17:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 17:09 [PATCH 0/8] FPGA Manager devres cleanup Moritz Fischer
2021-06-14 17:09 ` [PATCH 1/8] fpga: altera-pr-ip: Remove function alt_pr_unregister Moritz Fischer
2021-06-14 17:09 ` [PATCH 2/8] fpga: stratix10-soc: Add missing fpga_mgr_free() call Moritz Fischer
2021-06-14 17:30 ` Greg KH
2021-06-14 17:38 ` Russ Weight
2021-06-15 7:16 ` Greg KH
2021-06-14 17:40 ` Moritz Fischer
2021-06-15 7:28 ` Greg KH
2021-06-14 17:09 ` [PATCH 3/8] fpga: mgr: Rename dev to parent for parent device Moritz Fischer
2021-06-14 19:37 ` Tom Rix
2021-06-14 17:09 ` [PATCH 4/8] fpga: bridge: " Moritz Fischer
2021-06-14 17:09 ` [PATCH 5/8] fpga: region: " Moritz Fischer
2021-06-14 17:09 ` Moritz Fischer [this message]
2021-06-15 7:25 ` [PATCH 6/8] fpga: mgr: Use standard dev_release for class driver Greg KH
2021-06-15 16:00 ` Russ Weight
2021-06-14 17:09 ` [PATCH 7/8] fpga: bridge: " Moritz Fischer
2021-06-15 7:26 ` Greg KH
2021-06-14 17:09 ` [PATCH 8/8] fpga: region: " Moritz Fischer
2021-06-15 7:27 ` Greg KH
2021-06-15 7:30 ` [PATCH 0/8] FPGA Manager devres cleanup Greg KH
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=20210614170909.232415-7-mdf@kernel.org \
--to=mdf@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-fpga@vger.kernel.org \
--cc=russell.h.weight@intel.com \
--cc=yilun.xu@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).