From: Dave Jiang <dave.jiang@intel.com>
To: vkoul@kernel.org
Cc: Dan Williams <dan.j.williams@intel.com>, dmaengine@vger.kernel.org
Subject: [PATCH v3 12/18] dmanegine: idxd: open code the dsa_drv registration
Date: Thu, 15 Jul 2021 11:44:13 -0700 [thread overview]
Message-ID: <162637465319.744545.16325178432532362906.stgit@djiang5-desk3.ch.intel.com> (raw)
In-Reply-To: <162637445139.744545.6008938867943724701.stgit@djiang5-desk3.ch.intel.com>
Don't need a wrapper to register the driver. Just do it directly.
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/dma/idxd/idxd.h | 2 ++
drivers/dma/idxd/init.c | 10 +++++-----
drivers/dma/idxd/sysfs.c | 13 +------------
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index f933fd23155a..f308ff7cc6a3 100644
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -56,6 +56,8 @@ struct idxd_device_driver {
struct device_driver drv;
};
+extern struct idxd_device_driver dsa_drv;
+
struct idxd_irq_entry {
struct idxd_device *idxd;
int id;
diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index 9d62ba7f3bf7..9d9376281def 100644
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -832,9 +832,9 @@ static int __init idxd_init_module(void)
if (err < 0)
return err;
- err = idxd_register_driver();
+ err = idxd_driver_register(&dsa_drv);
if (err < 0)
- goto err_idxd_driver_register;
+ goto err_dsa_driver_register;
err = idxd_cdev_register();
if (err)
@@ -849,8 +849,8 @@ static int __init idxd_init_module(void)
err_pci_register:
idxd_cdev_remove();
err_cdev_register:
- idxd_unregister_driver();
-err_idxd_driver_register:
+ idxd_driver_unregister(&dsa_drv);
+err_dsa_driver_register:
idxd_unregister_bus_type();
return err;
}
@@ -858,7 +858,7 @@ module_init(idxd_init_module);
static void __exit idxd_exit_module(void)
{
- idxd_unregister_driver();
+ idxd_driver_unregister(&dsa_drv);
pci_unregister_driver(&idxd_pci_driver);
idxd_cdev_remove();
idxd_unregister_bus_type();
diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c
index 233593ff784e..1a6c9cf16a40 100644
--- a/drivers/dma/idxd/sysfs.c
+++ b/drivers/dma/idxd/sysfs.c
@@ -79,23 +79,12 @@ static void idxd_dsa_drv_remove(struct idxd_dev *idxd_dev)
}
}
-static struct idxd_device_driver dsa_drv = {
+struct idxd_device_driver dsa_drv = {
.name = "dsa",
.probe = idxd_dsa_drv_probe,
.remove = idxd_dsa_drv_remove,
};
-/* IDXD generic driver setup */
-int idxd_register_driver(void)
-{
- return idxd_driver_register(&dsa_drv);
-}
-
-void idxd_unregister_driver(void)
-{
- idxd_driver_unregister(&dsa_drv);
-}
-
/* IDXD engine attributes */
static ssize_t engine_group_id_show(struct device *dev,
struct device_attribute *attr, char *buf)
next prev parent reply other threads:[~2021-07-15 18:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 18:43 [PATCH v3 00/18] Fix idxd sub-drivers setup Dave Jiang
2021-07-15 18:43 ` [PATCH v3 01/18] dmaengine: idxd: add driver register helper Dave Jiang
2021-07-15 18:43 ` [PATCH v3 02/18] dmaengine: idxd: add driver name Dave Jiang
2021-07-15 18:43 ` [PATCH v3 03/18] dmaengine: idxd: add 'struct idxd_dev' as wrapper for conf_dev Dave Jiang
2021-07-15 18:43 ` [PATCH v3 04/18] dmaengine: idxd: remove IDXD_DEV_CONF_READY Dave Jiang
2021-07-15 18:43 ` [PATCH v3 05/18] dmaengine: idxd: move wq_enable() to device.c Dave Jiang
2021-07-15 18:43 ` [PATCH v3 06/18] dmaengine: idxd: move wq_disable() " Dave Jiang
2021-07-15 18:43 ` [PATCH v3 07/18] dmaengine: idxd: remove bus shutdown Dave Jiang
2021-07-15 18:43 ` [PATCH v3 08/18] dmaengine: idxd: remove iax_bus_type prototype Dave Jiang
2021-07-15 18:43 ` [PATCH v3 09/18] dmaengine: idxd: fix bus_probe() and bus_remove() for dsa_bus Dave Jiang
2021-07-15 18:44 ` [PATCH v3 10/18] dmaengine: idxd: move probe() bits for idxd 'struct device' to device.c Dave Jiang
2021-07-15 18:44 ` [PATCH v3 11/18] dmaengine: idxd: idxd: move remove() " Dave Jiang
2021-07-15 18:44 ` Dave Jiang [this message]
2021-07-15 18:44 ` [PATCH v3 13/18] dmaengine: idxd: add type to driver in order to allow device matching Dave Jiang
2021-07-15 18:44 ` [PATCH v3 14/18] dmaengine: idxd: create idxd_device sub-driver Dave Jiang
2021-07-15 18:44 ` [PATCH v3 15/18] dmaengine: idxd: create dmaengine driver for wq 'device' Dave Jiang
2021-07-15 18:44 ` [PATCH v3 16/18] dmaengine: idxd: create user " Dave Jiang
2021-07-15 18:44 ` [PATCH v3 17/18] dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone Dave Jiang
2021-07-15 18:44 ` [PATCH v3 18/18] dmaengine: idxd: move dsa_drv support to compatible mode Dave Jiang
2021-07-20 13:49 ` [PATCH v3 00/18] Fix idxd sub-drivers setup Vinod Koul
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=162637465319.744545.16325178432532362906.stgit@djiang5-desk3.ch.intel.com \
--to=dave.jiang@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=vkoul@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;
as well as URLs for NNTP newsgroup(s).