kernel: if SPEC is not necessary, use VIC structure

Make the VIC code indipendently as much as possible Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

kernel: if SPEC is not necessary, use VIC structure
Make the VIC code indipendently as much as possible Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
321cee38 · Federico Vaga · 4cb4b436 · 321cee38
Commit 321cee38 authored Jul 01, 2014 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

spec-vic.c kernel/spec-vic.c +6 -6

No files found.
--- a/kernel/spec-vic.c
+++ b/kernel/spec-vic.c
@@ -99,15 +99,15 @@ static int spec_vic_init(struct spec_dev *spec, struct fmc_device *fmc)
 	return 0;
 }

-static void spec_vic_exit(struct spec_dev *spec)
+static void spec_vic_exit(struct vic_irq_controller *vic)
 {
-	if (!spec->vic)
+	if (!vic)
 		return;

 	/* Disable all irq lines and the VIC in general */
-	vic_writel(spec->vic, 0xffffffff, VIC_REG_IDR);
-	vic_writel(spec->vic, 0, VIC_REG_CTL);
-	kfree(spec->vic);
+	vic_writel(vic, 0xffffffff, VIC_REG_IDR);
+	vic_writel(vic, 0, VIC_REG_CTL);
+	kfree(vic);
 }

 irqreturn_t spec_vic_irq_dispatch(struct spec_dev *spec)
@@ -207,7 +207,7 @@ int spec_vic_irq_free(struct spec_dev *spec, unsigned long id)

 	/* Clean up the VIC if there are no more handlers */
 	if (!vic_handler_count(spec->vic)) {
-		spec_vic_exit(spec);
+		spec_vic_exit(spec->vic);
 		spec->vic = NULL;
 	}