Skip to content

Commit

Permalink
cxl/pci: Use module_pci_driver
Browse files Browse the repository at this point in the history
Now that cxl_mem_{init,exit} no longer need to manage debugfs, switch
back to the smaller form of the boiler plate.

Acked-by: Ben Widawsky <ben.widawsky@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/163116435825.2460985.7201322215431441130.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
djbw committed Sep 21, 2021
1 parent 4faf31b commit 5a2328f
Showing 1 changed file with 8 additions and 22 deletions.
30 changes: 8 additions & 22 deletions drivers/cxl/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,13 @@ static int cxl_mem_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct cxl_mem *cxlm;
int rc;

/*
* Double check the anonymous union trickery in struct cxl_regs
* FIXME switch to struct_group()
*/
BUILD_BUG_ON(offsetof(struct cxl_regs, memdev) !=
offsetof(struct cxl_regs, device_regs.memdev));

rc = pcim_enable_device(pdev);
if (rc)
return rc;
Expand Down Expand Up @@ -571,27 +578,6 @@ static struct pci_driver cxl_mem_driver = {
},
};

static __init int cxl_mem_init(void)
{
int rc;

/* Double check the anonymous union trickery in struct cxl_regs */
BUILD_BUG_ON(offsetof(struct cxl_regs, memdev) !=
offsetof(struct cxl_regs, device_regs.memdev));

rc = pci_register_driver(&cxl_mem_driver);
if (rc)
return rc;

return 0;
}

static __exit void cxl_mem_exit(void)
{
pci_unregister_driver(&cxl_mem_driver);
}

MODULE_LICENSE("GPL v2");
module_init(cxl_mem_init);
module_exit(cxl_mem_exit);
module_pci_driver(cxl_mem_driver);
MODULE_IMPORT_NS(CXL);

0 comments on commit 5a2328f

Please sign in to comment.