Skip to content

Commit

Permalink
dmanegine: idxd: open code the dsa_drv registration
Browse files Browse the repository at this point in the history
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>
Link: https://lore.kernel.org/r/162637465319.744545.16325178432532362906.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Dave Jiang authored and Vinod Koul committed Jul 21, 2021
1 parent 745e92a commit c05257b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
2 changes: 2 additions & 0 deletions drivers/dma/idxd/idxd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions drivers/dma/idxd/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,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)
Expand All @@ -857,16 +857,16 @@ 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;
}
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();
Expand Down
13 changes: 1 addition & 12 deletions drivers/dma/idxd/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c05257b

Please sign in to comment.