| Message ID | 20241211-const_dfc_done-v4-10-583cc60329df@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | driver core: Constify API device_find_child() | expand |
On Wed, 11 Dec 2024 08:08:12 +0800 Zijun Hu <zijun_hu@icloud.com> wrote: > From: Zijun Hu <quic_zijuhu@quicinc.com> > > Static match_nvdimm_bridge(), as matching function of device_find_child() > matches a device with device type @cxl_nvdimm_bridge_type, and its task > can be simplified by the recently introduced API device_match_type(). > > Replace match_nvdimm_bridge() usage with device_match_type(). > > Reviewed-by: Alison Schofield <alison.schofield@intel.com> > Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> I don't see any uses of is_cxl_nvdimm_bridge() other than this one Drop that as well? This one is a bit of a trade off because the way is_cxl_nvdimm_bridge() is identified is kind of an internal detail, but it's been true for a long time so I'm fine with this change. Jonathan > --- > drivers/cxl/core/pmem.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c > index a8473de24ebfd92f12f47e0556e28b81a29cff7c..0f8166e793e14fc0b1c04ffda79e756a743d9e6b 100644 > --- a/drivers/cxl/core/pmem.c > +++ b/drivers/cxl/core/pmem.c > @@ -57,11 +57,6 @@ bool is_cxl_nvdimm_bridge(struct device *dev) > } > EXPORT_SYMBOL_NS_GPL(is_cxl_nvdimm_bridge, "CXL"); > > -static int match_nvdimm_bridge(struct device *dev, const void *data) > -{ > - return is_cxl_nvdimm_bridge(dev); > -} > - > /** > * cxl_find_nvdimm_bridge() - find a bridge device relative to a port > * @port: any descendant port of an nvdimm-bridge associated > @@ -75,7 +70,9 @@ struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_port *port) > if (!cxl_root) > return NULL; > > - dev = device_find_child(&cxl_root->port.dev, NULL, match_nvdimm_bridge); > + dev = device_find_child(&cxl_root->port.dev, > + &cxl_nvdimm_bridge_type, > + device_match_type); > > if (!dev) > return NULL; >
diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c index a8473de24ebfd92f12f47e0556e28b81a29cff7c..0f8166e793e14fc0b1c04ffda79e756a743d9e6b 100644 --- a/drivers/cxl/core/pmem.c +++ b/drivers/cxl/core/pmem.c @@ -57,11 +57,6 @@ bool is_cxl_nvdimm_bridge(struct device *dev) } EXPORT_SYMBOL_NS_GPL(is_cxl_nvdimm_bridge, "CXL"); -static int match_nvdimm_bridge(struct device *dev, const void *data) -{ - return is_cxl_nvdimm_bridge(dev); -} - /** * cxl_find_nvdimm_bridge() - find a bridge device relative to a port * @port: any descendant port of an nvdimm-bridge associated @@ -75,7 +70,9 @@ struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_port *port) if (!cxl_root) return NULL; - dev = device_find_child(&cxl_root->port.dev, NULL, match_nvdimm_bridge); + dev = device_find_child(&cxl_root->port.dev, + &cxl_nvdimm_bridge_type, + device_match_type); if (!dev) return NULL;