Message ID | 169657718805.1491153.2457900463470349092.stgit@dwillia2-xfh.jf.intel.com |
---|---|
State | Accepted |
Commit | f29a824b0b6710328a78b018de3c2cfa9db65876 |
Headers | show |
Series | cxl/mem: Fix shutdown order | expand |
Dan Williams wrote: > It is all too easy to get confused about @dev usage in the CXL driver > stack. Before adding a new cxl_pci_probe() setup operation that has a > devm lifetime dependent on @cxlds->dev binding, but also references > @cxlmd->dev, and prints messages, rework the devm_cxl_add_memdev() and > cxl_memdev_setup_fw_upload() function signatures to make this > distinction explicit. I.e. pass in the devm context as an @host argument > rather than infer it from other objects. > > This is in preparation for adding a devm_cxl_sanitize_setup_notifier(). > > Note the whitespace fixup near the change of the devm_cxl_add_memdev() > signature. That uncaught typo originated in the patch that added > cxl_memdev_security_init(). > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > drivers/cxl/core/memdev.c | 16 ++++++++-------- > drivers/cxl/cxlmem.h | 5 +++-- > drivers/cxl/pci.c | 4 ++-- > tools/testing/cxl/test/mem.c | 4 ++-- > 4 files changed, 15 insertions(+), 14 deletions(-) > > diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c > index 6efe4e2a2cf5..63353d990374 100644 > --- a/drivers/cxl/core/memdev.c > +++ b/drivers/cxl/core/memdev.c > @@ -960,12 +960,12 @@ static const struct fw_upload_ops cxl_memdev_fw_ops = { > .cleanup = cxl_fw_cleanup, > }; > > -static void devm_cxl_remove_fw_upload(void *fwl) > +static void cxl_remove_fw_upload(void *fwl) Technically this drop of devm (and add to the setup call below) is not covered in the cover letter. However, I like it. Reviewed-by: Ira Weiny <ira.weiny@intel.com> > { > firmware_upload_unregister(fwl); > } > > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds) > { > struct cxl_dev_state *cxlds = &mds->cxlds; > struct device *dev = &cxlds->cxlmd->dev; > @@ -978,10 +978,9 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > &cxl_memdev_fw_ops, mds); > if (IS_ERR(fwl)) > return PTR_ERR(fwl); > - > - return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl); > + return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl); > } > -EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL); > +EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_fw_upload, CXL); > > static const struct file_operations cxl_memdev_fops = { > .owner = THIS_MODULE, > @@ -1019,9 +1018,10 @@ static int cxl_memdev_security_init(struct cxl_memdev *cxlmd) > } > > return devm_add_action_or_reset(cxlds->dev, put_sanitize, mds); > - } > +} > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds) > { > struct cxl_memdev *cxlmd; > struct device *dev; > @@ -1053,7 +1053,7 @@ struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > if (rc) > goto err; > > - rc = devm_add_action_or_reset(cxlds->dev, cxl_memdev_unregister, cxlmd); > + rc = devm_add_action_or_reset(host, cxl_memdev_unregister, cxlmd); > if (rc) > return ERR_PTR(rc); > return cxlmd; > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h > index 55f00ad17a77..fdb2c8dd98d0 100644 > --- a/drivers/cxl/cxlmem.h > +++ b/drivers/cxl/cxlmem.h > @@ -84,9 +84,10 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) > return is_cxl_memdev(port->uport_dev); > } > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds); > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds); > struct cxl_memdev_state; > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds); > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds); > int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, > resource_size_t base, resource_size_t len, > resource_size_t skipped); > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index dc665b12be8f..7c117eb62750 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -867,11 +867,11 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > if (rc) > return rc; > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 464fc39ed277..68118c37f0b5 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -1450,11 +1450,11 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > mdata->mes.mds = mds; > cxl_mock_add_event_logs(&mdata->mes); > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > >
On Fri, 06 Oct 2023 00:26:28 -0700 Dan Williams <dan.j.williams@intel.com> wrote: > It is all too easy to get confused about @dev usage in the CXL driver > stack. Before adding a new cxl_pci_probe() setup operation that has a > devm lifetime dependent on @cxlds->dev binding, but also references > @cxlmd->dev, and prints messages, rework the devm_cxl_add_memdev() and > cxl_memdev_setup_fw_upload() function signatures to make this > distinction explicit. I.e. pass in the devm context as an @host argument > rather than infer it from other objects. > > This is in preparation for adding a devm_cxl_sanitize_setup_notifier(). > > Note the whitespace fixup near the change of the devm_cxl_add_memdev() > signature. That uncaught typo originated in the patch that added > cxl_memdev_security_init(). > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Definitely an improvement in readability. Nice. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/core/memdev.c | 16 ++++++++-------- > drivers/cxl/cxlmem.h | 5 +++-- > drivers/cxl/pci.c | 4 ++-- > tools/testing/cxl/test/mem.c | 4 ++-- > 4 files changed, 15 insertions(+), 14 deletions(-) > > diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c > index 6efe4e2a2cf5..63353d990374 100644 > --- a/drivers/cxl/core/memdev.c > +++ b/drivers/cxl/core/memdev.c > @@ -960,12 +960,12 @@ static const struct fw_upload_ops cxl_memdev_fw_ops = { > .cleanup = cxl_fw_cleanup, > }; > > -static void devm_cxl_remove_fw_upload(void *fwl) > +static void cxl_remove_fw_upload(void *fwl) > { > firmware_upload_unregister(fwl); > } > > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds) > { > struct cxl_dev_state *cxlds = &mds->cxlds; > struct device *dev = &cxlds->cxlmd->dev; > @@ -978,10 +978,9 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > &cxl_memdev_fw_ops, mds); > if (IS_ERR(fwl)) > return PTR_ERR(fwl); > - > - return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl); > + return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl); > } > -EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL); > +EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_fw_upload, CXL); > > static const struct file_operations cxl_memdev_fops = { > .owner = THIS_MODULE, > @@ -1019,9 +1018,10 @@ static int cxl_memdev_security_init(struct cxl_memdev *cxlmd) > } > > return devm_add_action_or_reset(cxlds->dev, put_sanitize, mds); > - } > +} > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds) > { > struct cxl_memdev *cxlmd; > struct device *dev; > @@ -1053,7 +1053,7 @@ struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > if (rc) > goto err; > > - rc = devm_add_action_or_reset(cxlds->dev, cxl_memdev_unregister, cxlmd); > + rc = devm_add_action_or_reset(host, cxl_memdev_unregister, cxlmd); > if (rc) > return ERR_PTR(rc); > return cxlmd; > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h > index 55f00ad17a77..fdb2c8dd98d0 100644 > --- a/drivers/cxl/cxlmem.h > +++ b/drivers/cxl/cxlmem.h > @@ -84,9 +84,10 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) > return is_cxl_memdev(port->uport_dev); > } > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds); > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds); > struct cxl_memdev_state; > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds); > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds); > int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, > resource_size_t base, resource_size_t len, > resource_size_t skipped); > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index dc665b12be8f..7c117eb62750 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -867,11 +867,11 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > if (rc) > return rc; > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 464fc39ed277..68118c37f0b5 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -1450,11 +1450,11 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > mdata->mes.mds = mds; > cxl_mock_add_event_logs(&mdata->mes); > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > >
On 10/6/23 00:26, Dan Williams wrote: > It is all too easy to get confused about @dev usage in the CXL driver > stack. Before adding a new cxl_pci_probe() setup operation that has a > devm lifetime dependent on @cxlds->dev binding, but also references > @cxlmd->dev, and prints messages, rework the devm_cxl_add_memdev() and > cxl_memdev_setup_fw_upload() function signatures to make this > distinction explicit. I.e. pass in the devm context as an @host argument > rather than infer it from other objects. > > This is in preparation for adding a devm_cxl_sanitize_setup_notifier(). > > Note the whitespace fixup near the change of the devm_cxl_add_memdev() > signature. That uncaught typo originated in the patch that added > cxl_memdev_security_init(). > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/cxl/core/memdev.c | 16 ++++++++-------- > drivers/cxl/cxlmem.h | 5 +++-- > drivers/cxl/pci.c | 4 ++-- > tools/testing/cxl/test/mem.c | 4 ++-- > 4 files changed, 15 insertions(+), 14 deletions(-) > > diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c > index 6efe4e2a2cf5..63353d990374 100644 > --- a/drivers/cxl/core/memdev.c > +++ b/drivers/cxl/core/memdev.c > @@ -960,12 +960,12 @@ static const struct fw_upload_ops cxl_memdev_fw_ops = { > .cleanup = cxl_fw_cleanup, > }; > > -static void devm_cxl_remove_fw_upload(void *fwl) > +static void cxl_remove_fw_upload(void *fwl) > { > firmware_upload_unregister(fwl); > } > > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds) > { > struct cxl_dev_state *cxlds = &mds->cxlds; > struct device *dev = &cxlds->cxlmd->dev; > @@ -978,10 +978,9 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) > &cxl_memdev_fw_ops, mds); > if (IS_ERR(fwl)) > return PTR_ERR(fwl); > - > - return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl); > + return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl); > } > -EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL); > +EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_fw_upload, CXL); > > static const struct file_operations cxl_memdev_fops = { > .owner = THIS_MODULE, > @@ -1019,9 +1018,10 @@ static int cxl_memdev_security_init(struct cxl_memdev *cxlmd) > } > > return devm_add_action_or_reset(cxlds->dev, put_sanitize, mds); > - } > +} > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds) > { > struct cxl_memdev *cxlmd; > struct device *dev; > @@ -1053,7 +1053,7 @@ struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) > if (rc) > goto err; > > - rc = devm_add_action_or_reset(cxlds->dev, cxl_memdev_unregister, cxlmd); > + rc = devm_add_action_or_reset(host, cxl_memdev_unregister, cxlmd); > if (rc) > return ERR_PTR(rc); > return cxlmd; > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h > index 55f00ad17a77..fdb2c8dd98d0 100644 > --- a/drivers/cxl/cxlmem.h > +++ b/drivers/cxl/cxlmem.h > @@ -84,9 +84,10 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) > return is_cxl_memdev(port->uport_dev); > } > > -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds); > +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, > + struct cxl_dev_state *cxlds); > struct cxl_memdev_state; > -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds); > +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds); > int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, > resource_size_t base, resource_size_t len, > resource_size_t skipped); > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index dc665b12be8f..7c117eb62750 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -867,11 +867,11 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > if (rc) > return rc; > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 464fc39ed277..68118c37f0b5 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -1450,11 +1450,11 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > mdata->mes.mds = mds; > cxl_mock_add_event_logs(&mdata->mes); > > - cxlmd = devm_cxl_add_memdev(cxlds); > + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); > if (IS_ERR(cxlmd)) > return PTR_ERR(cxlmd); > > - rc = cxl_memdev_setup_fw_upload(mds); > + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); > if (rc) > return rc; > > >
diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index 6efe4e2a2cf5..63353d990374 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -960,12 +960,12 @@ static const struct fw_upload_ops cxl_memdev_fw_ops = { .cleanup = cxl_fw_cleanup, }; -static void devm_cxl_remove_fw_upload(void *fwl) +static void cxl_remove_fw_upload(void *fwl) { firmware_upload_unregister(fwl); } -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds) { struct cxl_dev_state *cxlds = &mds->cxlds; struct device *dev = &cxlds->cxlmd->dev; @@ -978,10 +978,9 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) &cxl_memdev_fw_ops, mds); if (IS_ERR(fwl)) return PTR_ERR(fwl); - - return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl); + return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl); } -EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL); +EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_fw_upload, CXL); static const struct file_operations cxl_memdev_fops = { .owner = THIS_MODULE, @@ -1019,9 +1018,10 @@ static int cxl_memdev_security_init(struct cxl_memdev *cxlmd) } return devm_add_action_or_reset(cxlds->dev, put_sanitize, mds); - } +} -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, + struct cxl_dev_state *cxlds) { struct cxl_memdev *cxlmd; struct device *dev; @@ -1053,7 +1053,7 @@ struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) if (rc) goto err; - rc = devm_add_action_or_reset(cxlds->dev, cxl_memdev_unregister, cxlmd); + rc = devm_add_action_or_reset(host, cxl_memdev_unregister, cxlmd); if (rc) return ERR_PTR(rc); return cxlmd; diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 55f00ad17a77..fdb2c8dd98d0 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -84,9 +84,10 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) return is_cxl_memdev(port->uport_dev); } -struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds); +struct cxl_memdev *devm_cxl_add_memdev(struct device *host, + struct cxl_dev_state *cxlds); struct cxl_memdev_state; -int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds); +int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds); int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, resource_size_t base, resource_size_t len, resource_size_t skipped); diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index dc665b12be8f..7c117eb62750 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -867,11 +867,11 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (rc) return rc; - cxlmd = devm_cxl_add_memdev(cxlds); + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); - rc = cxl_memdev_setup_fw_upload(mds); + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); if (rc) return rc; diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 464fc39ed277..68118c37f0b5 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -1450,11 +1450,11 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) mdata->mes.mds = mds; cxl_mock_add_event_logs(&mdata->mes); - cxlmd = devm_cxl_add_memdev(cxlds); + cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds); if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); - rc = cxl_memdev_setup_fw_upload(mds); + rc = devm_cxl_setup_fw_upload(&pdev->dev, mds); if (rc) return rc;
It is all too easy to get confused about @dev usage in the CXL driver stack. Before adding a new cxl_pci_probe() setup operation that has a devm lifetime dependent on @cxlds->dev binding, but also references @cxlmd->dev, and prints messages, rework the devm_cxl_add_memdev() and cxl_memdev_setup_fw_upload() function signatures to make this distinction explicit. I.e. pass in the devm context as an @host argument rather than infer it from other objects. This is in preparation for adding a devm_cxl_sanitize_setup_notifier(). Note the whitespace fixup near the change of the devm_cxl_add_memdev() signature. That uncaught typo originated in the patch that added cxl_memdev_security_init(). Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/cxl/core/memdev.c | 16 ++++++++-------- drivers/cxl/cxlmem.h | 5 +++-- drivers/cxl/pci.c | 4 ++-- tools/testing/cxl/test/mem.c | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-)