diff options
| author | Alan Tull <atull@opensource.altera.com> | 2015-10-29 20:39:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-11-25 00:25:46 +0100 |
| commit | 07687c031d14a1f36613231c0ea13ce3c4025615 (patch) | |
| tree | 547bbc98dc572e3acafbe83bb7a29912e2fa5541 /drivers/fpga/fpga-mgr.c | |
| parent | Linux 4.4-rc2 (diff) | |
| download | linux-07687c031d14a1f36613231c0ea13ce3c4025615.tar.xz linux-07687c031d14a1f36613231c0ea13ce3c4025615.zip | |
fpga manager: remove label
Remove implementation of 'label' DT binding.
Signed-off-by: Alan Tull <atull@opensource.altera.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
| -rw-r--r-- | drivers/fpga/fpga-mgr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index a24f5cb877e0..bfbf8aa2de04 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -256,7 +256,6 @@ int fpga_mgr_register(struct device *dev, const char *name, void *priv) { struct fpga_manager *mgr; - const char *dt_label; int id, ret; if (!mops || !mops->write_init || !mops->write || @@ -300,11 +299,9 @@ int fpga_mgr_register(struct device *dev, const char *name, mgr->dev.id = id; 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); if (ret) |