diff options
author | Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
commit | 112d6212c80a1c560757520bd822a41c0ad15c2c (patch) | |
tree | 051580f1a55aa8d1b59120f21767a624d0291dbc /drivers/fpga/fpga-mgr.c | |
parent | 3e5ec1db8bfee845d9f8560d1c64aeaccd586398 (diff) | |
parent | 4f5cafb5cb8471e54afdc9054d973535614f7675 (diff) |
Merge tag 'v5.4-rc3' into spi-5.4
Linux 5.4-rc3
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
-rw-r--r-- | drivers/fpga/fpga-mgr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index c3866816456a..e05104f5e40c 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -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); |