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

fpga: fpga-mgr: wrap the state() op 



An FPGA manager should not be required to provide a state() op.
Add a wrapper consistent with the other op wrappers.
Move op check to wrapper.
Default to FPGA_MGR_STATE_UNKNOWN, what noop state() ops use.
Remove unneeded noop state() ops

[mdf@kernel.org: Reworded first line]
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
parent 6f992271

drivers/fpga/dfl-fme-mgr.c

+0 −6
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ static int fme_mgr_write_complete(struct fpga_manager *mgr, 
	return 0;

}



static enum fpga_mgr_states fme_mgr_state(struct fpga_manager *mgr)

{

	return FPGA_MGR_STATE_UNKNOWN;

}



static u64 fme_mgr_status(struct fpga_manager *mgr)

{

	struct fme_mgr_priv *priv = mgr->priv;
@@ -268,7 +263,6 @@ static const struct fpga_manager_ops fme_mgr_ops = { 
	.write_init = fme_mgr_write_init,

	.write = fme_mgr_write,

	.write_complete = fme_mgr_write_complete,

	.state = fme_mgr_state,

	.status = fme_mgr_status,

};

drivers/fpga/fpga-mgr.c

+9 −2
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ struct fpga_mgr_devres { 
	struct fpga_manager *mgr;

};



static inline enum fpga_mgr_states fpga_mgr_state(struct fpga_manager *mgr)

{

	if (mgr->mops->state)

		return  mgr->mops->state(mgr);

	return FPGA_MGR_STATE_UNKNOWN;

}



static inline u64 fpga_mgr_status(struct fpga_manager *mgr)

{

	if (mgr->mops->status)
@@ -589,7 +596,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name, 
	struct fpga_manager *mgr;

	int id, ret;



	if (!mops || !mops->state) {

	if (!mops) {

		dev_err(parent, "Attempt to register without fpga_manager_ops\n");

		return NULL;

	}
@@ -707,7 +714,7 @@ int fpga_mgr_register(struct fpga_manager *mgr) 
	 * from device.  FPGA may be in reset mode or may have been programmed

	 * by bootloader or EEPROM.

	 */

	mgr->state = mgr->mops->state(mgr);

	mgr->state = fpga_mgr_state(mgr);



	ret = device_add(&mgr->dev);

	if (ret)

drivers/fpga/stratix10-soc.c

+0 −6
Original line number Diff line number Diff line
@@ -388,13 +388,7 @@ static int s10_ops_write_complete(struct fpga_manager *mgr, 
	return ret;

}



static enum fpga_mgr_states s10_ops_state(struct fpga_manager *mgr)

{

	return FPGA_MGR_STATE_UNKNOWN;

}



static const struct fpga_manager_ops s10_ops = {

	.state = s10_ops_state,

	.write_init = s10_ops_write_init,

	.write = s10_ops_write,

	.write_complete = s10_ops_write_complete,

drivers/fpga/ts73xx-fpga.c

+0 −6
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ struct ts73xx_fpga_priv { 
	struct device	*dev;

};



static enum fpga_mgr_states ts73xx_fpga_state(struct fpga_manager *mgr)

{

	return FPGA_MGR_STATE_UNKNOWN;

}



static int ts73xx_fpga_write_init(struct fpga_manager *mgr,

				  struct fpga_image_info *info,

				  const char *buf, size_t count)
@@ -98,7 +93,6 @@ static int ts73xx_fpga_write_complete(struct fpga_manager *mgr, 
}



static const struct fpga_manager_ops ts73xx_fpga_ops = {

	.state		= ts73xx_fpga_state,

	.write_init	= ts73xx_fpga_write_init,

	.write		= ts73xx_fpga_write,

	.write_complete	= ts73xx_fpga_write_complete,