moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
This commit is contained in:
Tom Rix
2021-06-25 12:51:46 -07:00
committed by Moritz Fischer
parent 6f99227113
commit b02a40713d
4 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/fpga/dfl-fme-mgr.c
View File

@@ -252,11 +252,6 @@ static int fme_mgr_write_complete(struct fpga_manager *mgr,
return 0; 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) static u64 fme_mgr_status(struct fpga_manager *mgr)
{ {
struct fme_mgr_priv *priv = mgr->priv; 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_init = fme_mgr_write_init,
.write = fme_mgr_write, .write = fme_mgr_write,
.write_complete = fme_mgr_write_complete, .write_complete = fme_mgr_write_complete,
.state = fme_mgr_state,
.status = fme_mgr_status, .status = fme_mgr_status,
}; };

11
drivers/fpga/fpga-mgr.c
View File

@@ -25,6 +25,13 @@ struct fpga_mgr_devres {
struct fpga_manager *mgr; 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) static inline u64 fpga_mgr_status(struct fpga_manager *mgr)
{ {
if (mgr->mops->status) if (mgr->mops->status)
@@ -589,7 +596,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name,
struct fpga_manager *mgr; struct fpga_manager *mgr;
int id, ret; int id, ret;
if (!mops || !mops->state) { if (!mops) {
dev_err(parent, "Attempt to register without fpga_manager_ops\n"); dev_err(parent, "Attempt to register without fpga_manager_ops\n");
return NULL; 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 * from device. FPGA may be in reset mode or may have been programmed
* by bootloader or EEPROM. * by bootloader or EEPROM.
*/ */
mgr->state = mgr->mops->state(mgr); mgr->state = fpga_mgr_state(mgr);
ret = device_add(&mgr->dev); ret = device_add(&mgr->dev);
if (ret) if (ret)

6
drivers/fpga/stratix10-soc.c
View File

@@ -388,13 +388,7 @@ static int s10_ops_write_complete(struct fpga_manager *mgr,
return ret; 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 = { static const struct fpga_manager_ops s10_ops = {
.state = s10_ops_state,
.write_init = s10_ops_write_init, .write_init = s10_ops_write_init,
.write = s10_ops_write, .write = s10_ops_write,
.write_complete = s10_ops_write_complete, .write_complete = s10_ops_write_complete,

6
drivers/fpga/ts73xx-fpga.c
View File

@@ -32,11 +32,6 @@ struct ts73xx_fpga_priv {
struct device *dev; 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, static int ts73xx_fpga_write_init(struct fpga_manager *mgr,
struct fpga_image_info *info, struct fpga_image_info *info,
const char *buf, size_t count) 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 = { static const struct fpga_manager_ops ts73xx_fpga_ops = {
.state = ts73xx_fpga_state,
.write_init = ts73xx_fpga_write_init, .write_init = ts73xx_fpga_write_init,
.write = ts73xx_fpga_write, .write = ts73xx_fpga_write,
.write_complete = ts73xx_fpga_write_complete, .write_complete = ts73xx_fpga_write_complete,