From 84b693e3786b92d2e7bb9108ca187253ffd02115 Mon Sep 17 00:00:00 2001 From: Wu Hao Date: Mon, 12 Aug 2019 10:49:56 +0800 Subject: fpga: dfl: make init callback optional 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 Acked-by: Moritz Fischer Signed-off-by: Moritz Fischer --- drivers/fpga/dfl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/fpga') diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c index c0512afc4ed7..96a2b8274a33 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; -- cgit v1.2.3