From: trix@redhat.com
To: hao.wu@intel.com, mdf@kernel.org, michal.simek@xilinx.com
Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, Tom Rix <trix@redhat.com>
Subject: [PATCH v3 2/7] fpga-mgr: make write_complete() op optional
Date: Wed, 23 Jun 2021 11:24:05 -0700 [thread overview]
Message-ID: <20210623182410.3787784-4-trix@redhat.com> (raw)
In-Reply-To: <20210623182410.3787784-1-trix@redhat.com>
From: Tom Rix <trix@redhat.com>
An FPGA manager should not be required to provide a
write_complete function if there is nothing. Move
the op check to the existing wrapper.
Default to success.
Remove noop function.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/fpga-mgr.c | 7 ++++---
drivers/fpga/zynqmp-fpga.c | 7 -------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c
index 87bbb940c9504..1c2cce1320367 100644
--- a/drivers/fpga/fpga-mgr.c
+++ b/drivers/fpga/fpga-mgr.c
@@ -152,10 +152,11 @@ static int fpga_mgr_write_init_sg(struct fpga_manager *mgr,
static int fpga_mgr_write_complete(struct fpga_manager *mgr,
struct fpga_image_info *info)
{
- int ret;
+ int ret = 0;
mgr->state = FPGA_MGR_STATE_WRITE_COMPLETE;
- ret = mgr->mops->write_complete(mgr, info);
+ if (mgr->mops && mgr->mops->write_complete)
+ ret = mgr->mops->write_complete(mgr, info);
if (ret) {
dev_err(&mgr->dev, "Error after writing image data to FPGA\n");
mgr->state = FPGA_MGR_STATE_WRITE_COMPLETE_ERR;
@@ -576,7 +577,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name,
struct fpga_manager *mgr;
int id, ret;
- if (!mops || !mops->write_complete || !mops->state ||
+ if (!mops || !mops->state ||
(!mops->write && !mops->write_sg) ||
(mops->write && mops->write_sg)) {
dev_err(parent, "Attempt to register without fpga_manager_ops\n");
diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c
index 125743c9797ff..9efbd70aa6864 100644
--- a/drivers/fpga/zynqmp-fpga.c
+++ b/drivers/fpga/zynqmp-fpga.c
@@ -66,12 +66,6 @@ static int zynqmp_fpga_ops_write(struct fpga_manager *mgr,
return ret;
}
-static int zynqmp_fpga_ops_write_complete(struct fpga_manager *mgr,
- struct fpga_image_info *info)
-{
- return 0;
-}
-
static enum fpga_mgr_states zynqmp_fpga_ops_state(struct fpga_manager *mgr)
{
u32 status = 0;
@@ -87,7 +81,6 @@ static const struct fpga_manager_ops zynqmp_fpga_ops = {
.state = zynqmp_fpga_ops_state,
.write_init = zynqmp_fpga_ops_write_init,
.write = zynqmp_fpga_ops_write,
- .write_complete = zynqmp_fpga_ops_write_complete,
};
static int zynqmp_fpga_probe(struct platform_device *pdev)
--
2.26.3
next prev parent reply other threads:[~2021-06-23 18:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 18:24 [PATCH v3 0/7] wrappers for fpga_manager_ops trix
2021-06-23 18:24 ` [PATCH v3 1/7] fpga-mgr: wrap the write_init() op trix
2021-06-24 7:54 ` Xu Yilun
2021-06-24 14:37 ` Tom Rix
2021-06-23 18:24 ` trix [this message]
2021-06-23 18:24 ` [PATCH v3 3/7] fpga-mgr: wrap the write() op trix
2021-06-23 18:24 ` [PATCH v3 4/7] fpga-mgr: wrap the status() op trix
2021-06-23 18:24 ` [PATCH v3 5/7] fpga-mgr: wrap the state() op trix
2021-06-23 18:24 ` [PATCH v3 6/7] fpga-mgr: wrap the fpga_remove() op trix
2021-06-23 18:24 ` [PATCH v3 7/7] fpga-mgr: collect wrappers and change to inline trix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623182410.3787784-4-trix@redhat.com \
--to=trix@redhat.com \
--cc=hao.wu@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=michal.simek@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).