| Message ID | 7b21d96aaabc9ae20bda658bc1ed5b0981e3fc61.1511605972.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25 November 2017 at 03:51, Lukas Wunner <lukas@wunner.de> wrote: > No need to reinvent the wheel, we have bus_find_device_by_name(). > > Signed-off-by: Lukas Wunner <lukas@wunner.de> Applied - thanks. Mathieu > --- > drivers/hwtracing/coresight/coresight.c | 25 +++++-------------------- > 1 file changed, 5 insertions(+), 20 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c > index b8091bef21dc..389c4baeca9d 100644 > --- a/drivers/hwtracing/coresight/coresight.c > +++ b/drivers/hwtracing/coresight/coresight.c > @@ -843,32 +843,17 @@ static void coresight_fixup_orphan_conns(struct coresight_device *csdev) > } > > > -static int coresight_name_match(struct device *dev, void *data) > -{ > - char *to_match; > - struct coresight_device *i_csdev; > - > - to_match = data; > - i_csdev = to_coresight_device(dev); > - > - if (to_match && !strcmp(to_match, dev_name(&i_csdev->dev))) > - return 1; > - > - return 0; > -} > - > static void coresight_fixup_device_conns(struct coresight_device *csdev) > { > int i; > - struct device *dev = NULL; > - struct coresight_connection *conn; > > for (i = 0; i < csdev->nr_outport; i++) { > - conn = &csdev->conns[i]; > - dev = bus_find_device(&coresight_bustype, NULL, > - (void *)conn->child_name, > - coresight_name_match); > + struct coresight_connection *conn = &csdev->conns[i]; > + struct device *dev = NULL; > > + if (conn->child_name) > + dev = bus_find_device_by_name(&coresight_bustype, NULL, > + conn->child_name); > if (dev) { > conn->child_dev = to_coresight_device(dev); > /* and put reference from 'bus_find_device()' */ > -- > 2.11.0 >
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index b8091bef21dc..389c4baeca9d 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -843,32 +843,17 @@ static void coresight_fixup_orphan_conns(struct coresight_device *csdev) } -static int coresight_name_match(struct device *dev, void *data) -{ - char *to_match; - struct coresight_device *i_csdev; - - to_match = data; - i_csdev = to_coresight_device(dev); - - if (to_match && !strcmp(to_match, dev_name(&i_csdev->dev))) - return 1; - - return 0; -} - static void coresight_fixup_device_conns(struct coresight_device *csdev) { int i; - struct device *dev = NULL; - struct coresight_connection *conn; for (i = 0; i < csdev->nr_outport; i++) { - conn = &csdev->conns[i]; - dev = bus_find_device(&coresight_bustype, NULL, - (void *)conn->child_name, - coresight_name_match); + struct coresight_connection *conn = &csdev->conns[i]; + struct device *dev = NULL; + if (conn->child_name) + dev = bus_find_device_by_name(&coresight_bustype, NULL, + conn->child_name); if (dev) { conn->child_dev = to_coresight_device(dev); /* and put reference from 'bus_find_device()' */
No need to reinvent the wheel, we have bus_find_device_by_name(). Signed-off-by: Lukas Wunner <lukas@wunner.de> --- drivers/hwtracing/coresight/coresight.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-)