Commit 72d93502 authored by Tom Rix's avatar Tom Rix Committed by Moritz Fischer
Browse files

fpga: fpga-mgr: make write_complete() op optional 



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 and remove noop function.

[mdf@kernel.org: Reworded message]
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
parent 2e8438b7

drivers/fpga/fpga-mgr.c

+23 −22
Original line number Diff line number Diff line
@@ -25,6 +25,28 @@ struct fpga_mgr_devres { 
	struct fpga_manager *mgr;

};



/*

 * After all the FPGA image has been written, do the device specific steps to

 * finish and set the FPGA into operating mode.

 */

static inline int fpga_mgr_write_complete(struct fpga_manager *mgr,

					  struct fpga_image_info *info)

{

	int ret = 0;



	mgr->state = FPGA_MGR_STATE_WRITE_COMPLETE;

	if (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;

		return ret;

	}

	mgr->state = FPGA_MGR_STATE_OPERATING;



	return 0;

}



static inline int fpga_mgr_write_init(struct fpga_manager *mgr,

				      struct fpga_image_info *info,

				      const char *buf, size_t count)
@@ -146,27 +168,6 @@ static int fpga_mgr_write_init_sg(struct fpga_manager *mgr, 
	return ret;

}



/*

 * After all the FPGA image has been written, do the device specific steps to

 * finish and set the FPGA into operating mode.

 */

static int fpga_mgr_write_complete(struct fpga_manager *mgr,

				   struct fpga_image_info *info)

{

	int ret;



	mgr->state = FPGA_MGR_STATE_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;

		return ret;

	}

	mgr->state = FPGA_MGR_STATE_OPERATING;



	return 0;

}



/**

 * fpga_mgr_buf_load_sg - load fpga from image in buffer from a scatter list

 * @mgr:	fpga manager
@@ -577,7 +578,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");

drivers/fpga/zynqmp-fpga.c

+0 −7
Original line number Diff line number Diff line
@@ -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)