On Thu, Oct 29, 2015 at 12:39 PM, <[email protected]> wrote: > From: Alan Tull <[email protected]> > > Remove implementation of 'label' DT binding. > > Signed-off-by: Alan Tull <[email protected]> > --- > 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 <[email protected]> Cheers, Moritz -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
