cxl/pci: Use module_pci_driver

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>

diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index c9f2ac134f4dcd45ccc10026f4c1ece0147a8d72..27f75b5a2ee2c3c271620a3d5ab26ac60208bd6a 100644 (file)
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -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;
@@ -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);