| Message ID | 170449247353.3779673.5963704495491343135.stgit@djiang5-mobl3 |
|---|---|
| State | Accepted |
| Commit | 66f11890d35a609012037cccfd9e63ed98474f99 |
| Headers | show |
| Series | cxl: find_cxl_root() related cleanups | expand |
On 05.01.24 15:07:53, Dave Jiang wrote: > Use scope-based resource management __free() macro to drop the open coded > put_device() in cxl_find_nvdimm_bridge(). > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > v6: > - Cleanup put_device() > v5 > - Update commit log (Dan) > --- > drivers/cxl/core/pmem.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c > index da92a901b9e8..e69625a8d6a1 100644 > --- a/drivers/cxl/core/pmem.c > +++ b/drivers/cxl/core/pmem.c > @@ -64,16 +64,14 @@ static int match_nvdimm_bridge(struct device *dev, void *data) > > struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_memdev *cxlmd) > { > - struct cxl_root *cxl_root = find_cxl_root(cxlmd->endpoint); > - struct cxl_port *port; > + struct cxl_root *cxl_root __free(put_cxl_root) = > + find_cxl_root(cxlmd->endpoint); > struct device *dev; > > if (!cxl_root) > return NULL; Can the check be removed here too? -Robert > > - port = &cxl_root->port; > - dev = device_find_child(&port->dev, NULL, match_nvdimm_bridge); > - put_device(&port->dev); > + dev = device_find_child(&cxl_root->port.dev, NULL, match_nvdimm_bridge); > > if (!dev) > return NULL; > >
diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c index da92a901b9e8..e69625a8d6a1 100644 --- a/drivers/cxl/core/pmem.c +++ b/drivers/cxl/core/pmem.c @@ -64,16 +64,14 @@ static int match_nvdimm_bridge(struct device *dev, void *data) struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_memdev *cxlmd) { - struct cxl_root *cxl_root = find_cxl_root(cxlmd->endpoint); - struct cxl_port *port; + struct cxl_root *cxl_root __free(put_cxl_root) = + find_cxl_root(cxlmd->endpoint); struct device *dev; if (!cxl_root) return NULL; - port = &cxl_root->port; - dev = device_find_child(&port->dev, NULL, match_nvdimm_bridge); - put_device(&port->dev); + dev = device_find_child(&cxl_root->port.dev, NULL, match_nvdimm_bridge); if (!dev) return NULL;