Skip to content

S
Simple PCIe FMC carrier SPEC
Commit 1af4ca96 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

drv:compat: better loading structure to suppress warnings 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e7558452
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
kernel/spec-compat.c
View file @ 1af4ca96
......@@ -151,32 +151,40 @@ struct fpga_manager *fpga_mgr_get(struct device *dev)
}
#endif
int compat_spec_fw_load(struct spec_dev *spec, const char *name)
{
struct fpga_manager *mgr;
struct fpga_image_info image;
int err;
mgr = fpga_mgr_get(&spec->dev);
if (IS_ERR(mgr))
return -ENODEV;
static int __compat_spec_fw_load(struct fpga_manager *mgr, const char *name)
{
#if KERNEL_VERSION(4,16,0) > LINUX_VERSION_CODE && !defined(CONFIG_FPGA_MGR_BACKPORT)
#if KERNEL_VERSION(4,10,0) > LINUX_VERSION_CODE
err = fpga_mgr_firmware_load(mgr, 0, name);
return fpga_mgr_firmware_load(mgr, 0, name);
#else
struct fpga_image_info image;
memset(&image, 0, sizeof(image));
err = fpga_mgr_firmware_load(mgr, &image, name);
return fpga_mgr_firmware_load(mgr, &image, name);
#endif
#else
struct fpga_image_info image;
memset(&image, 0, sizeof(image));
image.firmware_name = (char *)name;
image.dev = &spec->dev;
mgr = spec->mgr;
err = fpga_mgr_load(mgr, &image);
return fpga_mgr_load(mgr, &image);
#endif
}
int compat_spec_fw_load(struct spec_dev *spec, const char *name)
{
struct fpga_manager *mgr;
int err;
mgr = fpga_mgr_get(&spec->dev);
if (IS_ERR(mgr))
return -ENODEV;
err = __compat_spec_fw_load(mgr, name);
fpga_mgr_put(mgr);
return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment