Commit 07687c03 authored by Alan Tull's avatar Alan Tull Committed by Greg Kroah-Hartman

fpga manager: remove label

Remove implementation of 'label' DT binding.
Signed-off-by: default avatarAlan Tull <atull@opensource.altera.com>
Reviewed-by: default avatarMoritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ec21837
...@@ -256,7 +256,6 @@ int fpga_mgr_register(struct device *dev, const char *name, ...@@ -256,7 +256,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
void *priv) void *priv)
{ {
struct fpga_manager *mgr; struct fpga_manager *mgr;
const char *dt_label;
int id, ret; int id, ret;
if (!mops || !mops->write_init || !mops->write || if (!mops || !mops->write_init || !mops->write ||
...@@ -300,11 +299,9 @@ int fpga_mgr_register(struct device *dev, const char *name, ...@@ -300,11 +299,9 @@ int fpga_mgr_register(struct device *dev, const char *name,
mgr->dev.id = id; mgr->dev.id = id;
dev_set_drvdata(dev, mgr); dev_set_drvdata(dev, mgr);
dt_label = of_get_property(mgr->dev.of_node, "label", NULL);
if (dt_label)
ret = dev_set_name(&mgr->dev, "%s", dt_label);
else
ret = dev_set_name(&mgr->dev, "fpga%d", id); ret = dev_set_name(&mgr->dev, "fpga%d", id);
if (ret)
goto error_device;
ret = device_add(&mgr->dev); ret = device_add(&mgr->dev);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment