Messages in this thread | | | Date | Thu, 29 Oct 2015 14:17:23 -0700 | Subject | Re: [PATCH] fpga manager: remove label | From | Moritz Fischer <> |
| |
On Thu, Oct 29, 2015 at 12:39 PM, <atull@opensource.altera.com> wrote: > From: Alan Tull <atull@opensource.altera.com> > > Remove implementation of 'label' DT binding. > > Signed-off-by: Alan Tull <atull@opensource.altera.com> > --- > drivers/fpga/fpga-mgr.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c > index 45c41cb..f747311 100644 > --- a/drivers/fpga/fpga-mgr.c > +++ b/drivers/fpga/fpga-mgr.c > @@ -257,7 +257,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 || > @@ -305,11 +304,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) > -- > 1.7.9.5 > I had never used the if (dt_label) path, so the else path is pretty well tested ;-)
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Cheers,
Moritz
| |