Skip to content

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

sw:drv: ask app_offset only once 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent c0ba199b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
software/kernel/spec-core-fpga.c
View file @ 342e390b
...@@ -728,12 +728,11 @@ static int spec_fpga_app_id_build(struct spec_fpga *spec_fpga, ...@@ -728,12 +728,11 @@ static int spec_fpga_app_id_build(struct spec_fpga *spec_fpga,
} }
static int spec_fpga_app_init_res_mem(struct spec_fpga *spec_fpga, static int spec_fpga_app_init_res_mem(struct spec_fpga *spec_fpga,
struct resource *res) unsigned int app_offset,
struct resource *res)
{ {
struct pci_dev *pcidev = to_pci_dev(spec_fpga->dev.parent); struct pci_dev *pcidev = to_pci_dev(spec_fpga->dev.parent);
unsigned long app_offset;
app_offset = spec_fpga_csr_app_offset(spec_fpga);
if (!app_offset) if (!app_offset)
return -ENODEV; return -ENODEV;
...@@ -797,14 +796,15 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga) ...@@ -797,14 +796,15 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
struct resource *res; struct resource *res;
struct platform_device *pdev; struct platform_device *pdev;
char app_name[SPEC_FPGA_APP_NAME_MAX]; char app_name[SPEC_FPGA_APP_NAME_MAX];
unsigned int app_offset;
int err = 0; int err = 0;
app_offset = spec_fpga_csr_app_offset(spec_fpga);
res = kcalloc(SPEC_FPGA_APP_RES_N, sizeof(*res), GFP_KERNEL); res = kcalloc(SPEC_FPGA_APP_RES_N, sizeof(*res), GFP_KERNEL);
if (!res) if (!res)
return -ENOMEM; return -ENOMEM;
err = spec_fpga_app_init_res_mem(spec_fpga, err = spec_fpga_app_init_res_mem(spec_fpga, app_offset,
&res[SPEC_FPGA_APP_RES_MEM]); &res[SPEC_FPGA_APP_RES_MEM]);
if (err) { if (err) {
dev_warn(&spec_fpga->dev, "Application not found\n"); dev_warn(&spec_fpga->dev, "Application not found\n");
...@@ -817,8 +817,7 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga) ...@@ -817,8 +817,7 @@ static int spec_fpga_app_init(struct spec_fpga *spec_fpga)
&res[SPEC_FPGA_APP_RES_IRQ_START], &res[SPEC_FPGA_APP_RES_IRQ_START],
SPEC_FPGA_APP_RES_IRQ_N); SPEC_FPGA_APP_RES_IRQ_N);
err = spec_fpga_app_id_build(spec_fpga, err = spec_fpga_app_id_build(spec_fpga, app_offset,
spec_fpga_csr_app_offset(spec_fpga),
app_name, SPEC_FPGA_APP_NAME_MAX); app_name, SPEC_FPGA_APP_NAME_MAX);
if (err) if (err)
goto err_free; goto err_free;
......
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