| Message ID | 1565578204-13969-2-git-send-email-hao.wu@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | FPGA DFL updates | expand |
Hi, On Mon, Aug 12, 2019 at 10:49:56AM +0800, Wu Hao wrote: > This patch makes init callback of sub features optional. With > this change, people don't need to prepare any empty init callback. > > Signed-off-by: Wu Hao <hao.wu@intel.com> Acked-by: Moritz Fischer <mdf@kernel.org> > --- > drivers/fpga/dfl.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c > index c0512af..96a2b82 100644 > --- a/drivers/fpga/dfl.c > +++ b/drivers/fpga/dfl.c > @@ -271,11 +271,13 @@ static int dfl_feature_instance_init(struct platform_device *pdev, > struct dfl_feature *feature, > struct dfl_feature_driver *drv) > { > - int ret; > + int ret = 0; > > - ret = drv->ops->init(pdev, feature); > - if (ret) > - return ret; > + if (drv->ops->init) { > + ret = drv->ops->init(pdev, feature); > + if (ret) > + return ret; > + } > > feature->ops = drv->ops; You could swap it around maybe like so: int dfl_feature_instance_init() ... { feature->ops = drv->ops; if (drv->ops->init) return drv->ops->init(pdev, feature); return 0; } With the caveat that feature->ops gets always set ... Your call. Thanks, Moritz
On Tue, Aug 20, 2019 at 08:24:06PM -0700, Moritz Fischer wrote: > Hi, > > On Mon, Aug 12, 2019 at 10:49:56AM +0800, Wu Hao wrote: > > This patch makes init callback of sub features optional. With > > this change, people don't need to prepare any empty init callback. > > > > Signed-off-by: Wu Hao <hao.wu@intel.com> > > Acked-by: Moritz Fischer <mdf@kernel.org> > > --- > > drivers/fpga/dfl.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c > > index c0512af..96a2b82 100644 > > --- a/drivers/fpga/dfl.c > > +++ b/drivers/fpga/dfl.c > > @@ -271,11 +271,13 @@ static int dfl_feature_instance_init(struct platform_device *pdev, > > struct dfl_feature *feature, > > struct dfl_feature_driver *drv) > > { > > - int ret; > > + int ret = 0; > > > > - ret = drv->ops->init(pdev, feature); > > - if (ret) > > - return ret; > > + if (drv->ops->init) { > > + ret = drv->ops->init(pdev, feature); > > + if (ret) > > + return ret; > > + } > > > > feature->ops = drv->ops; > > You could swap it around maybe like so: > > int dfl_feature_instance_init() ... > { > feature->ops = drv->ops; > if (drv->ops->init) > return drv->ops->init(pdev, feature); > > return 0; > } > > With the caveat that feature->ops gets always set ... > > Your call. Hi Moritz, Thanks a lot for the review and comments. It does simplify the code, will modify it. Thanks Hao > > Thanks, > Moritz
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c index c0512af..96a2b82 100644 --- a/drivers/fpga/dfl.c +++ b/drivers/fpga/dfl.c @@ -271,11 +271,13 @@ static int dfl_feature_instance_init(struct platform_device *pdev, struct dfl_feature *feature, struct dfl_feature_driver *drv) { - int ret; + int ret = 0; - ret = drv->ops->init(pdev, feature); - if (ret) - return ret; + if (drv->ops->init) { + ret = drv->ops->init(pdev, feature); + if (ret) + return ret; + } feature->ops = drv->ops;
This patch makes init callback of sub features optional. With this change, people don't need to prepare any empty init callback. Signed-off-by: Wu Hao <hao.wu@intel.com> --- drivers/fpga/dfl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)