Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfba5de9 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

drivers: Introduce device lookup variants by of_node 



Introduce wrappers for {bus/driver/class}_find_device() to
locate devices by its of_node.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: devicetree@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-i2c@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-spi@vger.kernel.org
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Alan Tull <atull@kernel.org>
Cc: linux-fpga@vger.kernel.org
Cc: Peter Rosin <peda@axentia.se>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Thor Thayer <thor.thayer@linux.intel.com>
Cc: Jiri Slaby <jslaby@suse.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Peter Rosin <peda@axentia.se>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de> # I2C part
Acked-by: Moritz Fischer <mdf@kernel.org> # For FPGA part
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20190723221838.12024-3-suzuki.poulose@arm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6cda08a2

drivers/amba/tegra-ahb.c

+1 −10
Original line number Diff line number Diff line
@@ -134,22 +134,13 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset) 
}



#ifdef CONFIG_TEGRA_IOMMU_SMMU

static int tegra_ahb_match_by_smmu(struct device *dev, const void *data)

{

	struct tegra_ahb *ahb = dev_get_drvdata(dev);

	const struct device_node *dn = data;



	return (ahb->dev->of_node == dn) ? 1 : 0;

}



int tegra_ahb_enable_smmu(struct device_node *dn)

{

	struct device *dev;

	u32 val;

	struct tegra_ahb *ahb;



	dev = driver_find_device(&tegra_ahb_driver.driver, NULL, dn,

				 tegra_ahb_match_by_smmu);

	dev = driver_find_device_by_of_node(&tegra_ahb_driver.driver, dn);

	if (!dev)

		return -EPROBE_DEFER;

	ahb = dev_get_drvdata(dev);

drivers/fpga/fpga-bridge.c

+1 −7
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ static struct class *fpga_bridge_class; 
/* Lock for adding/removing bridges to linked lists*/

static spinlock_t bridge_list_lock;



static int fpga_bridge_of_node_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



/**

 * fpga_bridge_enable - Enable transactions on the bridge

 *
@@ -104,8 +99,7 @@ struct fpga_bridge *of_fpga_bridge_get(struct device_node *np, 
{

	struct device *dev;



	dev = class_find_device(fpga_bridge_class, NULL, np,

				fpga_bridge_of_node_match);

	dev = class_find_device_by_of_node(fpga_bridge_class, np);

	if (!dev)

		return ERR_PTR(-ENODEV);

drivers/fpga/fpga-mgr.c

+1 −7
Original line number Diff line number Diff line
@@ -482,11 +482,6 @@ struct fpga_manager *fpga_mgr_get(struct device *dev) 
}

EXPORT_SYMBOL_GPL(fpga_mgr_get);



static int fpga_mgr_of_node_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



/**

 * of_fpga_mgr_get - Given a device node, get a reference to a fpga mgr.

 *
@@ -498,8 +493,7 @@ struct fpga_manager *of_fpga_mgr_get(struct device_node *node) 
{

	struct device *dev;



	dev = class_find_device(fpga_mgr_class, NULL, node,

				fpga_mgr_of_node_match);

	dev = class_find_device_by_of_node(fpga_mgr_class, node);

	if (!dev)

		return ERR_PTR(-ENODEV);

drivers/gpu/drm/drm_mipi_dsi.c

+1 −6
Original line number Diff line number Diff line
@@ -93,11 +93,6 @@ static struct bus_type mipi_dsi_bus_type = { 
	.pm = &mipi_dsi_device_pm_ops,

};



static int of_device_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



/**

 * of_find_mipi_dsi_device_by_node() - find the MIPI DSI device matching a

 *    device tree node
@@ -110,7 +105,7 @@ struct mipi_dsi_device *of_find_mipi_dsi_device_by_node(struct device_node *np) 
{

	struct device *dev;



	dev = bus_find_device(&mipi_dsi_bus_type, NULL, np, of_device_match);

	dev = bus_find_device_by_of_node(&mipi_dsi_bus_type, np);



	return dev ? to_mipi_dsi_device(dev) : NULL;

}

drivers/i2c/i2c-core-of.c

+1 −6
Original line number Diff line number Diff line
@@ -113,11 +113,6 @@ void of_i2c_register_devices(struct i2c_adapter *adap) 
	of_node_put(bus);

}



static int of_dev_node_match(struct device *dev, const void *data)

{

	return dev->of_node == data;

}



static int of_dev_or_parent_node_match(struct device *dev, const void *data)

{

	if (dev->of_node == data)
@@ -135,7 +130,7 @@ 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_of_node(&i2c_bus_type, node);

	if (!dev)

		return NULL;