evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fpga manager: remove label

Browse source 
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>
This commit is contained in:
Alan Tull 2015-10-29 14:39:56 -05:00 • committed by Greg Kroah-Hartman
parent 1ec218373b
commit 07687c031d
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/fpga/fpga-mgr.c
View file

@ -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,
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); ret = dev_set_name(&mgr->dev, "fpga%d", id);
if (dt_label) if (ret)
ret = dev_set_name(&mgr->dev, "%s", dt_label); goto error_device;
else
ret = dev_set_name(&mgr->dev, "fpga%d", id);
ret = device_add(&mgr->dev); ret = device_add(&mgr->dev);
if (ret) if (ret)