Merge tag 'thermal-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal...

[J-linux.git] / drivers / fpga / fpga-mgr.c

diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index c3866816456abee4159af6eafe1d0ab107c69a22..f38bab01432e2eae6a1bc7d7bd541837c488bcb0 100644 (file)
--- 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);
 
@@ -587,10 +581,8 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
                return NULL;
 
        id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
+       if (id < 0)
                goto error_kfree;
-       }
 
        mutex_init(&mgr->ref_mutex);