diff options
| author | Tom Rix <trix@redhat.com> | 2021-06-25 12:51:42 -0700 |
|---|---|---|
| committer | Moritz Fischer <mdf@kernel.org> | 2021-07-24 15:10:30 -0700 |
| commit | 2e8438b754abcf13f2306237bd0bfe6e7dcb379a (patch) | |
| tree | c50a451147b623c95c2c2afe1b906976b4c1889c /drivers/fpga | |
| parent | 6f125e87184ea5f8ad677c2cc4a9c9c6e717554b (diff) | |
| download | linux-stable-2e8438b754abcf13f2306237bd0bfe6e7dcb379a.tar.gz linux-stable-2e8438b754abcf13f2306237bd0bfe6e7dcb379a.tar.bz2 linux-stable-2e8438b754abcf13f2306237bd0bfe6e7dcb379a.zip | |
fpga: fpga-mgr: wrap the write_init() op
An FPGA manager should not be required to provide a
write_init() op if there is nothing for it do.
So add a wrapper and move the op checking.
Default to success.
[mdf@kernel.org: Reworded first line]
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/fpga-mgr.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index ecb4c3c795fa..c047de8a059b 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -25,6 +25,15 @@ struct fpga_mgr_devres { struct fpga_manager *mgr; }; +static inline int fpga_mgr_write_init(struct fpga_manager *mgr, + struct fpga_image_info *info, + const char *buf, size_t count) +{ + if (mgr->mops->write_init) + return mgr->mops->write_init(mgr, info, buf, count); + return 0; +} + /** * fpga_image_info_alloc - Allocate an FPGA image info struct * @dev: owning device @@ -83,9 +92,9 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr, mgr->state = FPGA_MGR_STATE_WRITE_INIT; if (!mgr->mops->initial_header_size) - ret = mgr->mops->write_init(mgr, info, NULL, 0); + ret = fpga_mgr_write_init(mgr, info, NULL, 0); else - ret = mgr->mops->write_init( + ret = fpga_mgr_write_init( mgr, info, buf, min(mgr->mops->initial_header_size, count)); if (ret) { @@ -569,7 +578,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name, int id, ret; if (!mops || !mops->write_complete || !mops->state || - !mops->write_init || (!mops->write && !mops->write_sg) || + (!mops->write && !mops->write_sg) || (mops->write && mops->write_sg)) { dev_err(parent, "Attempt to register without fpga_manager_ops\n"); return NULL; |