* [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode @ 2018-09-25 5:28 Silesh C V 2018-09-25 5:28 ` [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode Silesh C V 2018-10-08 8:13 ` [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Rafael J. Wysocki 0 siblings, 2 replies; 10+ messages in thread From: Silesh C V @ 2018-09-25 5:28 UTC (permalink / raw) To: Greg Kroah-Hartman, Rafael J. Wysocki Cc: linux-kernel, Rob Herring, Frank Rowand, Silesh C V Some drivers need to find the device on a bus having a specific firmware node. Currently, such drivers have their own implementations to do this. Provide a helper similar to bus_find_device_by_name so that each driver does not have to reinvent this. Signed-off-by: Silesh C V <svellattu@mvista.com> --- drivers/base/bus.c | 26 ++++++++++++++++++++++++++ include/linux/device.h | 3 +++ 2 files changed, 29 insertions(+) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 8bfd27e..148b198 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -17,6 +17,7 @@ #include <linux/string.h> #include <linux/mutex.h> #include <linux/sysfs.h> +#include <linux/of.h> #include "base.h" #include "power/power.h" @@ -373,6 +374,31 @@ struct device *bus_find_device_by_name(struct bus_type *bus, } EXPORT_SYMBOL_GPL(bus_find_device_by_name); +static int match_fwnode(struct device *dev, void *data) +{ + struct fwnode_handle *fwnode = data; + struct device_node *of_node = to_of_node(fwnode); + + if (of_node) + return dev->of_node == of_node; + else + return dev->fwnode == fwnode; +} + +/** + * bus_find_device_by_fwnode - device iterator for locating a particular device + * having a specific firmware node + * @bus: bus type + * @start: Device to begin with + * @fwnode: firmware node of the device to match + */ +struct device *bus_find_device_by_fwnode(struct bus_type *bus, struct device *start, + struct fwnode_handle *fwnode) +{ + return bus_find_device(bus, start, (void *)fwnode, match_fwnode); +} +EXPORT_SYMBOL_GPL(bus_find_device_by_fwnode); + /** * subsys_find_device_by_id - find a device with a specific enumeration number * @subsys: subsystem diff --git a/include/linux/device.h b/include/linux/device.h index 8f88254..09384f6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -171,6 +171,9 @@ struct device *bus_find_device(struct bus_type *bus, struct device *start, struct device *bus_find_device_by_name(struct bus_type *bus, struct device *start, const char *name); +struct device *bus_find_device_by_fwnode(struct bus_type *bus, + struct device *start, + struct fwnode_handle *fwnode); struct device *subsys_find_device_by_id(struct bus_type *bus, unsigned int id, struct device *hint); int bus_for_each_drv(struct bus_type *bus, struct device_driver *start, -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 5:28 [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Silesh C V @ 2018-09-25 5:28 ` Silesh C V 2018-09-25 7:04 ` Greg Kroah-Hartman 2018-10-08 8:13 ` [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Rafael J. Wysocki 1 sibling, 1 reply; 10+ messages in thread From: Silesh C V @ 2018-09-25 5:28 UTC (permalink / raw) To: Greg Kroah-Hartman, Rafael J. Wysocki Cc: linux-kernel, Rob Herring, Frank Rowand, Silesh C V Use bus_find_device_by_fwnode helper to find the device having a specific firmware node on a bus. --- drivers/hwtracing/coresight/of_coresight.c | 14 ++++---------- drivers/i2c/i2c-core-of.c | 9 ++------- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +------- drivers/nvmem/core.c | 7 +------ drivers/of/of_mdio.c | 8 +------- drivers/of/platform.c | 7 +------ drivers/spi/spi.c | 10 +++------- 8 files changed, 14 insertions(+), 57 deletions(-) diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c index 6880bee..8193b50 100644 --- a/drivers/hwtracing/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c @@ -17,12 +17,6 @@ #include <linux/cpumask.h> #include <asm/smp_plat.h> - -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - static struct device * of_coresight_get_endpoint_device(struct device_node *endpoint) { @@ -32,8 +26,8 @@ static int of_dev_node_match(struct device *dev, void *data) * If we have a non-configurable replicator, it will be found on the * platform bus. */ - dev = bus_find_device(&platform_bus_type, NULL, - endpoint, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, + &endpoint->fwnode); if (dev) return dev; @@ -41,8 +35,8 @@ static int of_dev_node_match(struct device *dev, void *data) * We have a configurable component - circle through the AMBA bus * looking for the device that matches the endpoint node. */ - return bus_find_device(&amba_bustype, NULL, - endpoint, of_dev_node_match); + return bus_find_device_by_fwnode(&amba_bustype, NULL, + &endpoint->fwnode); } static void of_coresight_get_ports(const struct device_node *node, diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6cb7ad6..2b8ef8d 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -116,18 +116,13 @@ void of_i2c_register_devices(struct i2c_adapter *adap) of_node_put(bus); } -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned i2c_client device */ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) { struct device *dev; struct i2c_client *client; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; @@ -145,7 +140,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) struct device *dev; struct i2c_adapter *adapter; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c index 081aa91..b0d418e 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c @@ -4832,19 +4832,13 @@ static void hns_roce_v1_cleanup_eq_table(struct hns_roce_dev *hr_dev) }; MODULE_DEVICE_TABLE(acpi, hns_roce_acpi_match); -static int hns_roce_node_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - static struct platform_device *hns_roce_find_pdev(struct fwnode_handle *fwnode) { struct device *dev; /* get the 'device' corresponding to the matching 'fwnode' */ - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_roce_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); /* get the platform device */ return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 16294cd..d5d7c88 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -758,17 +758,11 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev) return (void *)misc_op; } -static int hns_dsaf_dev_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - struct platform_device *hns_dsaf_find_platform_device(struct fwnode_handle *fwnode) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_dsaf_dev_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index aa16578..b62f236 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -262,11 +262,6 @@ static void nvmem_release(struct device *dev) .name = "nvmem", }; -static int of_nvmem_match(struct device *dev, void *nvmem_np) -{ - return dev->of_node == nvmem_np; -} - static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) { struct device *d; @@ -274,7 +269,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) if (!nvmem_np) return NULL; - d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_nvmem_match); + d = bus_find_device_by_fwnode(&nvmem_bus_type, NULL, &nvmem_np->fwnode); if (!d) return NULL; diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index e92391d..2906a6b 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -282,12 +282,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) } EXPORT_SYMBOL(of_mdiobus_register); -/* Helper function for of_phy_find_device */ -static int of_phy_match(struct device *dev, void *phy_np) -{ - return dev->of_node == phy_np; -} - /** * of_phy_find_device - Give a PHY node, find the phy_device * @phy_np: Pointer to the phy's device tree node @@ -303,7 +297,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np) if (!phy_np) return NULL; - d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); + d = bus_find_device_by_fwnode(&mdio_bus_type, NULL, &phy_np->fwnode); if (d) { mdiodev = to_mdio_device(d); if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 6c59673..36dd58e 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -37,11 +37,6 @@ {} /* Empty terminated list */ }; -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /** * of_find_device_by_node - Find the platform_device associated with a node * @np: Pointer to device tree node @@ -55,7 +50,7 @@ struct platform_device *of_find_device_by_node(struct device_node *np) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, &np->fwnode); return dev ? to_platform_device(dev) : NULL; } EXPORT_SYMBOL(of_find_device_by_node); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9da0bc5..97128a5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3324,16 +3324,12 @@ int spi_write_then_read(struct spi_device *spi, /*-------------------------------------------------------------------------*/ #if IS_ENABLED(CONFIG_OF_DYNAMIC) -static int __spi_of_device_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned spi_device device */ static struct spi_device *of_find_spi_device_by_node(struct device_node *node) { - struct device *dev = bus_find_device(&spi_bus_type, NULL, node, - __spi_of_device_match); + struct device *dev = bus_find_device_by_fwnode(&spi_bus_type, NULL, + &node->fwnode); + return dev ? to_spi_device(dev) : NULL; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 5:28 ` [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode Silesh C V @ 2018-09-25 7:04 ` Greg Kroah-Hartman 2018-09-25 7:31 ` Silesh C V 0 siblings, 1 reply; 10+ messages in thread From: Greg Kroah-Hartman @ 2018-09-25 7:04 UTC (permalink / raw) To: Silesh C V; +Cc: Rafael J. Wysocki, linux-kernel, Rob Herring, Frank Rowand On Tue, Sep 25, 2018 at 10:58:48AM +0530, Silesh C V wrote: > Use bus_find_device_by_fwnode helper to find the device having a > specific firmware node on a bus. > --- No signed off by? :( ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 7:04 ` Greg Kroah-Hartman @ 2018-09-25 7:31 ` Silesh C V 2018-09-25 7:41 ` Silesh C V 0 siblings, 1 reply; 10+ messages in thread From: Silesh C V @ 2018-09-25 7:31 UTC (permalink / raw) To: Greg Kroah-Hartman; +Cc: Rafael J. Wysocki, linux-kernel, robh+dt, frowand.list Hello Greg, On Tue, Sep 25, 2018 at 12:34 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Tue, Sep 25, 2018 at 10:58:48AM +0530, Silesh C V wrote: > > Use bus_find_device_by_fwnode helper to find the device having a > > specific firmware node on a bus. > > --- > > > No signed off by? > Oops.Sorry about that. Will send it again with Signed off by added. Thanks, Silesh ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 7:31 ` Silesh C V @ 2018-09-25 7:41 ` Silesh C V 2018-10-08 8:08 ` Rafael J. Wysocki 2018-10-08 15:45 ` Rob Herring 0 siblings, 2 replies; 10+ messages in thread From: Silesh C V @ 2018-09-25 7:41 UTC (permalink / raw) To: Greg Kroah-Hartman, Rafael J. Wysocki Cc: linux-kernel, Rob Herring, Frank Rowand, Silesh C V Use bus_find_device_by_fwnode helper to find the device having a specific firmware node on a bus. Signed-off-by: Silesh C V <svellattu@mvista.com> --- drivers/hwtracing/coresight/of_coresight.c | 14 ++++---------- drivers/i2c/i2c-core-of.c | 9 ++------- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +------- drivers/nvmem/core.c | 7 +------ drivers/of/of_mdio.c | 8 +------- drivers/of/platform.c | 7 +------ drivers/spi/spi.c | 10 +++------- 8 files changed, 14 insertions(+), 57 deletions(-) diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c index 6880bee..8193b50 100644 --- a/drivers/hwtracing/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c @@ -17,12 +17,6 @@ #include <linux/cpumask.h> #include <asm/smp_plat.h> - -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - static struct device * of_coresight_get_endpoint_device(struct device_node *endpoint) { @@ -32,8 +26,8 @@ static int of_dev_node_match(struct device *dev, void *data) * If we have a non-configurable replicator, it will be found on the * platform bus. */ - dev = bus_find_device(&platform_bus_type, NULL, - endpoint, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, + &endpoint->fwnode); if (dev) return dev; @@ -41,8 +35,8 @@ static int of_dev_node_match(struct device *dev, void *data) * We have a configurable component - circle through the AMBA bus * looking for the device that matches the endpoint node. */ - return bus_find_device(&amba_bustype, NULL, - endpoint, of_dev_node_match); + return bus_find_device_by_fwnode(&amba_bustype, NULL, + &endpoint->fwnode); } static void of_coresight_get_ports(const struct device_node *node, diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6cb7ad6..2b8ef8d 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -116,18 +116,13 @@ void of_i2c_register_devices(struct i2c_adapter *adap) of_node_put(bus); } -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned i2c_client device */ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) { struct device *dev; struct i2c_client *client; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; @@ -145,7 +140,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) struct device *dev; struct i2c_adapter *adapter; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c index 081aa91..b0d418e 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c @@ -4832,19 +4832,13 @@ static void hns_roce_v1_cleanup_eq_table(struct hns_roce_dev *hr_dev) }; MODULE_DEVICE_TABLE(acpi, hns_roce_acpi_match); -static int hns_roce_node_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - static struct platform_device *hns_roce_find_pdev(struct fwnode_handle *fwnode) { struct device *dev; /* get the 'device' corresponding to the matching 'fwnode' */ - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_roce_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); /* get the platform device */ return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 16294cd..d5d7c88 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -758,17 +758,11 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev) return (void *)misc_op; } -static int hns_dsaf_dev_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - struct platform_device *hns_dsaf_find_platform_device(struct fwnode_handle *fwnode) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_dsaf_dev_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index aa16578..b62f236 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -262,11 +262,6 @@ static void nvmem_release(struct device *dev) .name = "nvmem", }; -static int of_nvmem_match(struct device *dev, void *nvmem_np) -{ - return dev->of_node == nvmem_np; -} - static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) { struct device *d; @@ -274,7 +269,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) if (!nvmem_np) return NULL; - d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_nvmem_match); + d = bus_find_device_by_fwnode(&nvmem_bus_type, NULL, &nvmem_np->fwnode); if (!d) return NULL; diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index e92391d..2906a6b 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -282,12 +282,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) } EXPORT_SYMBOL(of_mdiobus_register); -/* Helper function for of_phy_find_device */ -static int of_phy_match(struct device *dev, void *phy_np) -{ - return dev->of_node == phy_np; -} - /** * of_phy_find_device - Give a PHY node, find the phy_device * @phy_np: Pointer to the phy's device tree node @@ -303,7 +297,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np) if (!phy_np) return NULL; - d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); + d = bus_find_device_by_fwnode(&mdio_bus_type, NULL, &phy_np->fwnode); if (d) { mdiodev = to_mdio_device(d); if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 6c59673..36dd58e 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -37,11 +37,6 @@ {} /* Empty terminated list */ }; -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /** * of_find_device_by_node - Find the platform_device associated with a node * @np: Pointer to device tree node @@ -55,7 +50,7 @@ struct platform_device *of_find_device_by_node(struct device_node *np) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, &np->fwnode); return dev ? to_platform_device(dev) : NULL; } EXPORT_SYMBOL(of_find_device_by_node); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9da0bc5..97128a5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3324,16 +3324,12 @@ int spi_write_then_read(struct spi_device *spi, /*-------------------------------------------------------------------------*/ #if IS_ENABLED(CONFIG_OF_DYNAMIC) -static int __spi_of_device_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned spi_device device */ static struct spi_device *of_find_spi_device_by_node(struct device_node *node) { - struct device *dev = bus_find_device(&spi_bus_type, NULL, node, - __spi_of_device_match); + struct device *dev = bus_find_device_by_fwnode(&spi_bus_type, NULL, + &node->fwnode); + return dev ? to_spi_device(dev) : NULL; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 7:41 ` Silesh C V @ 2018-10-08 8:08 ` Rafael J. Wysocki 2018-10-08 15:45 ` Rob Herring 1 sibling, 0 replies; 10+ messages in thread From: Rafael J. Wysocki @ 2018-10-08 8:08 UTC (permalink / raw) To: svellattu Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Linux Kernel Mailing List, Rob Herring, Frank Rowand On Tue, Sep 25, 2018 at 9:42 AM Silesh C V <svellattu@mvista.com> wrote: > > Use bus_find_device_by_fwnode helper to find the device having a > specific firmware node on a bus. > > Signed-off-by: Silesh C V <svellattu@mvista.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/hwtracing/coresight/of_coresight.c | 14 ++++---------- > drivers/i2c/i2c-core-of.c | 9 ++------- > drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +------- > drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +------- > drivers/nvmem/core.c | 7 +------ > drivers/of/of_mdio.c | 8 +------- > drivers/of/platform.c | 7 +------ > drivers/spi/spi.c | 10 +++------- > 8 files changed, 14 insertions(+), 57 deletions(-) > > diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c > index 6880bee..8193b50 100644 > --- a/drivers/hwtracing/coresight/of_coresight.c > +++ b/drivers/hwtracing/coresight/of_coresight.c > @@ -17,12 +17,6 @@ > #include <linux/cpumask.h> > #include <asm/smp_plat.h> > > - > -static int of_dev_node_match(struct device *dev, void *data) > -{ > - return dev->of_node == data; > -} > - > static struct device * > of_coresight_get_endpoint_device(struct device_node *endpoint) > { > @@ -32,8 +26,8 @@ static int of_dev_node_match(struct device *dev, void *data) > * If we have a non-configurable replicator, it will be found on the > * platform bus. > */ > - dev = bus_find_device(&platform_bus_type, NULL, > - endpoint, of_dev_node_match); > + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, > + &endpoint->fwnode); > if (dev) > return dev; > > @@ -41,8 +35,8 @@ static int of_dev_node_match(struct device *dev, void *data) > * We have a configurable component - circle through the AMBA bus > * looking for the device that matches the endpoint node. > */ > - return bus_find_device(&amba_bustype, NULL, > - endpoint, of_dev_node_match); > + return bus_find_device_by_fwnode(&amba_bustype, NULL, > + &endpoint->fwnode); > } > > static void of_coresight_get_ports(const struct device_node *node, > diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c > index 6cb7ad6..2b8ef8d 100644 > --- a/drivers/i2c/i2c-core-of.c > +++ b/drivers/i2c/i2c-core-of.c > @@ -116,18 +116,13 @@ void of_i2c_register_devices(struct i2c_adapter *adap) > of_node_put(bus); > } > > -static int of_dev_node_match(struct device *dev, void *data) > -{ > - return dev->of_node == data; > -} > - > /* must call put_device() when done with returned i2c_client device */ > struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) > { > struct device *dev; > struct i2c_client *client; > > - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); > + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); > if (!dev) > return NULL; > > @@ -145,7 +140,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) > struct device *dev; > struct i2c_adapter *adapter; > > - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); > + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); > if (!dev) > return NULL; > > diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > index 081aa91..b0d418e 100644 > --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c > @@ -4832,19 +4832,13 @@ static void hns_roce_v1_cleanup_eq_table(struct hns_roce_dev *hr_dev) > }; > MODULE_DEVICE_TABLE(acpi, hns_roce_acpi_match); > > -static int hns_roce_node_match(struct device *dev, void *fwnode) > -{ > - return dev->fwnode == fwnode; > -} > - > static struct > platform_device *hns_roce_find_pdev(struct fwnode_handle *fwnode) > { > struct device *dev; > > /* get the 'device' corresponding to the matching 'fwnode' */ > - dev = bus_find_device(&platform_bus_type, NULL, > - fwnode, hns_roce_node_match); > + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); > /* get the platform device */ > return dev ? to_platform_device(dev) : NULL; > } > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c > index 16294cd..d5d7c88 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c > +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c > @@ -758,17 +758,11 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev) > return (void *)misc_op; > } > > -static int hns_dsaf_dev_match(struct device *dev, void *fwnode) > -{ > - return dev->fwnode == fwnode; > -} > - > struct > platform_device *hns_dsaf_find_platform_device(struct fwnode_handle *fwnode) > { > struct device *dev; > > - dev = bus_find_device(&platform_bus_type, NULL, > - fwnode, hns_dsaf_dev_match); > + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); > return dev ? to_platform_device(dev) : NULL; > } > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index aa16578..b62f236 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -262,11 +262,6 @@ static void nvmem_release(struct device *dev) > .name = "nvmem", > }; > > -static int of_nvmem_match(struct device *dev, void *nvmem_np) > -{ > - return dev->of_node == nvmem_np; > -} > - > static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) > { > struct device *d; > @@ -274,7 +269,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) > if (!nvmem_np) > return NULL; > > - d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_nvmem_match); > + d = bus_find_device_by_fwnode(&nvmem_bus_type, NULL, &nvmem_np->fwnode); > > if (!d) > return NULL; > diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c > index e92391d..2906a6b 100644 > --- a/drivers/of/of_mdio.c > +++ b/drivers/of/of_mdio.c > @@ -282,12 +282,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) > } > EXPORT_SYMBOL(of_mdiobus_register); > > -/* Helper function for of_phy_find_device */ > -static int of_phy_match(struct device *dev, void *phy_np) > -{ > - return dev->of_node == phy_np; > -} > - > /** > * of_phy_find_device - Give a PHY node, find the phy_device > * @phy_np: Pointer to the phy's device tree node > @@ -303,7 +297,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np) > if (!phy_np) > return NULL; > > - d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); > + d = bus_find_device_by_fwnode(&mdio_bus_type, NULL, &phy_np->fwnode); > if (d) { > mdiodev = to_mdio_device(d); > if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 6c59673..36dd58e 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -37,11 +37,6 @@ > {} /* Empty terminated list */ > }; > > -static int of_dev_node_match(struct device *dev, void *data) > -{ > - return dev->of_node == data; > -} > - > /** > * of_find_device_by_node - Find the platform_device associated with a node > * @np: Pointer to device tree node > @@ -55,7 +50,7 @@ struct platform_device *of_find_device_by_node(struct device_node *np) > { > struct device *dev; > > - dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match); > + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, &np->fwnode); > return dev ? to_platform_device(dev) : NULL; > } > EXPORT_SYMBOL(of_find_device_by_node); > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 9da0bc5..97128a5 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -3324,16 +3324,12 @@ int spi_write_then_read(struct spi_device *spi, > /*-------------------------------------------------------------------------*/ > > #if IS_ENABLED(CONFIG_OF_DYNAMIC) > -static int __spi_of_device_match(struct device *dev, void *data) > -{ > - return dev->of_node == data; > -} > - > /* must call put_device() when done with returned spi_device device */ > static struct spi_device *of_find_spi_device_by_node(struct device_node *node) > { > - struct device *dev = bus_find_device(&spi_bus_type, NULL, node, > - __spi_of_device_match); > + struct device *dev = bus_find_device_by_fwnode(&spi_bus_type, NULL, > + &node->fwnode); > + > return dev ? to_spi_device(dev) : NULL; > } > > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-09-25 7:41 ` Silesh C V 2018-10-08 8:08 ` Rafael J. Wysocki @ 2018-10-08 15:45 ` Rob Herring 2018-10-09 3:13 ` Silesh C V 1 sibling, 1 reply; 10+ messages in thread From: Rob Herring @ 2018-10-08 15:45 UTC (permalink / raw) To: svellattu Cc: Greg Kroah-Hartman, Rafael J. Wysocki, linux-kernel, Frank Rowand In the future, please use get_maintainers.pl and send to the right lists and people. Perhaps the coresight, i2c, network, nvmem and spi maintainers would like to see and be aware of this change. On Tue, Sep 25, 2018 at 2:42 AM Silesh C V <svellattu@mvista.com> wrote: > > Use bus_find_device_by_fwnode helper to find the device having a > specific firmware node on a bus. > > Signed-off-by: Silesh C V <svellattu@mvista.com> > --- > drivers/hwtracing/coresight/of_coresight.c | 14 ++++---------- > drivers/i2c/i2c-core-of.c | 9 ++------- > drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +------- > drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +------- > drivers/nvmem/core.c | 7 +------ > drivers/of/of_mdio.c | 8 +------- > drivers/of/platform.c | 7 +------ > drivers/spi/spi.c | 10 +++------- > 8 files changed, 14 insertions(+), 57 deletions(-) Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode 2018-10-08 15:45 ` Rob Herring @ 2018-10-09 3:13 ` Silesh C V 0 siblings, 0 replies; 10+ messages in thread From: Silesh C V @ 2018-10-09 3:13 UTC (permalink / raw) To: Rob Herring Cc: Greg Kroah-Hartman, Rafael J. Wysocki, linux-kernel, Frank Rowand Hello Rob, Thanks for the review. On Mon, Oct 8, 2018 at 9:15 PM Rob Herring <robh+dt@kernel.org> wrote: > > In the future, please use get_maintainers.pl and send to the right > lists and people. Perhaps the coresight, i2c, network, nvmem and spi > maintainers would like to see and be aware of this change. > Sure. Will send v3 with all the right people copied. Regards, Silesh ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode 2018-09-25 5:28 [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Silesh C V 2018-09-25 5:28 ` [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode Silesh C V @ 2018-10-08 8:13 ` Rafael J. Wysocki 2018-10-09 3:11 ` Silesh C V 1 sibling, 1 reply; 10+ messages in thread From: Rafael J. Wysocki @ 2018-10-08 8:13 UTC (permalink / raw) To: svellattu Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Linux Kernel Mailing List, Rob Herring, Frank Rowand On Tue, Sep 25, 2018 at 7:29 AM Silesh C V <svellattu@mvista.com> wrote: > > Some drivers need to find the device on a bus having a specific firmware > node. Currently, such drivers have their own implementations to do this. > Provide a helper similar to bus_find_device_by_name so that each driver > does not have to reinvent this. > > Signed-off-by: Silesh C V <svellattu@mvista.com> > > --- > drivers/base/bus.c | 26 ++++++++++++++++++++++++++ > include/linux/device.h | 3 +++ > 2 files changed, 29 insertions(+) > > diff --git a/drivers/base/bus.c b/drivers/base/bus.c > index 8bfd27e..148b198 100644 > --- a/drivers/base/bus.c > +++ b/drivers/base/bus.c > @@ -17,6 +17,7 @@ > #include <linux/string.h> > #include <linux/mutex.h> > #include <linux/sysfs.h> > +#include <linux/of.h> > #include "base.h" > #include "power/power.h" > > @@ -373,6 +374,31 @@ struct device *bus_find_device_by_name(struct bus_type *bus, > } > EXPORT_SYMBOL_GPL(bus_find_device_by_name); > > +static int match_fwnode(struct device *dev, void *data) > +{ > + struct fwnode_handle *fwnode = data; > + struct device_node *of_node = to_of_node(fwnode); > + > + if (of_node) > + return dev->of_node == of_node; > + else > + return dev->fwnode == fwnode; Why don't you use dev_fwnode() here? > +} > + > +/** > + * bus_find_device_by_fwnode - device iterator for locating a particular device > + * having a specific firmware node > + * @bus: bus type > + * @start: Device to begin with > + * @fwnode: firmware node of the device to match > + */ > +struct device *bus_find_device_by_fwnode(struct bus_type *bus, struct device *start, > + struct fwnode_handle *fwnode) > +{ > + return bus_find_device(bus, start, (void *)fwnode, match_fwnode); > +} > +EXPORT_SYMBOL_GPL(bus_find_device_by_fwnode); > + > /** > * subsys_find_device_by_id - find a device with a specific enumeration number > * @subsys: subsystem > diff --git a/include/linux/device.h b/include/linux/device.h > index 8f88254..09384f6 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -171,6 +171,9 @@ struct device *bus_find_device(struct bus_type *bus, struct device *start, > struct device *bus_find_device_by_name(struct bus_type *bus, > struct device *start, > const char *name); > +struct device *bus_find_device_by_fwnode(struct bus_type *bus, > + struct device *start, > + struct fwnode_handle *fwnode); > struct device *subsys_find_device_by_id(struct bus_type *bus, unsigned int id, > struct device *hint); > int bus_for_each_drv(struct bus_type *bus, struct device_driver *start, > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode 2018-10-08 8:13 ` [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Rafael J. Wysocki @ 2018-10-09 3:11 ` Silesh C V 0 siblings, 0 replies; 10+ messages in thread From: Silesh C V @ 2018-10-09 3:11 UTC (permalink / raw) To: Rafael J. Wysocki Cc: Greg Kroah-Hartman, linux-kernel, Rob Herring, Frank Rowand Hello Rafael, On Mon, Oct 8, 2018 at 1:43 PM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Tue, Sep 25, 2018 at 7:29 AM Silesh C V <svellattu@mvista.com> wrote: > > > > Some drivers need to find the device on a bus having a specific firmware > > node. Currently, such drivers have their own implementations to do this. > > Provide a helper similar to bus_find_device_by_name so that each driver > > does not have to reinvent this. > > > > Signed-off-by: Silesh C V <svellattu@mvista.com> > > > > --- > > drivers/base/bus.c | 26 ++++++++++++++++++++++++++ > > include/linux/device.h | 3 +++ > > 2 files changed, 29 insertions(+) > > > > diff --git a/drivers/base/bus.c b/drivers/base/bus.c > > index 8bfd27e..148b198 100644 > > --- a/drivers/base/bus.c > > +++ b/drivers/base/bus.c > > @@ -17,6 +17,7 @@ > > #include <linux/string.h> > > #include <linux/mutex.h> > > #include <linux/sysfs.h> > > +#include <linux/of.h> > > #include "base.h" > > #include "power/power.h" > > > > @@ -373,6 +374,31 @@ struct device *bus_find_device_by_name(struct bus_type *bus, > > } > > EXPORT_SYMBOL_GPL(bus_find_device_by_name); > > > > +static int match_fwnode(struct device *dev, void *data) > > +{ > > + struct fwnode_handle *fwnode = data; > > + struct device_node *of_node = to_of_node(fwnode); > > + > > + if (of_node) > > + return dev->of_node == of_node; > > + else > > + return dev->fwnode == fwnode; > > Why don't you use dev_fwnode() here? > OK. Will send an updated patch. Thanks, Silesh. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-10-09 3:13 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-09-25 5:28 [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Silesh C V 2018-09-25 5:28 ` [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode Silesh C V 2018-09-25 7:04 ` Greg Kroah-Hartman 2018-09-25 7:31 ` Silesh C V 2018-09-25 7:41 ` Silesh C V 2018-10-08 8:08 ` Rafael J. Wysocki 2018-10-08 15:45 ` Rob Herring 2018-10-09 3:13 ` Silesh C V 2018-10-08 8:13 ` [PATCH v2 1/2] Driver core: add bus_find_device_by_fwnode Rafael J. Wysocki 2018-10-09 3:11 ` Silesh C V
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.