| Message ID | 162982122234.1124374.8206618857845373193.stgit@dwillia2-desk3.amr.corp.intel.com |
|---|---|
| State | Superseded |
| Commit | 5dc88cfe26310208cbc7abd90406beae2ffcc425 |
| Headers | show |
| Series | cxl_test: Enable CXL Topology and UAPI regression tests | expand |
On Tue, 24 Aug 2021 09:07:02 -0700 Dan Williams <dan.j.williams@intel.com> wrote: > 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> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Nice side effect of the refactoring. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/pci.c | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index b8075b941a3a..425e821160b5 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -519,6 +519,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; > @@ -573,27 +580,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); >
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index b8075b941a3a..425e821160b5 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -519,6 +519,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; @@ -573,27 +580,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);
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> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/cxl/pci.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-)