[ARM] Don't use host->irq

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

5 files changed, 17 insertions, 21 deletions

diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 7c4d50c34429..690717627963 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -306,7 +306,6 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	}
 
 	host->base = (unsigned long)base;
-	host->irq = NO_IRQ;
 	host->dma_channel = NO_DMA;
 
 	info = (struct arxescsi_info *)host->hostdata;
@@ -314,7 +313,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	info->base = base;
 
 	info->info.scsi.io_base		= base + 0x2000;
-	info->info.scsi.irq		= host->irq;
+	info->info.scsi.irq		= NO_IRQ;
 	info->info.scsi.io_shift	= 5;
 	info->info.ifcfg.clockrate	= 24; /* MHz */
 	info->info.ifcfg.select_timeout = 255;
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index a520491b76b6..0a86d23394d0 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -428,7 +428,6 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 	}
 
 	host->base	  = (unsigned long)base;
-	host->irq	  = ec->irq;
 	host->dma_channel = ec->dma;
 
 	ecard_set_drvdata(ec, host);
@@ -441,7 +440,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	info->info.scsi.io_base		= base + CUMANASCSI2_FAS216_OFFSET;
 	info->info.scsi.io_shift	= CUMANASCSI2_FAS216_SHIFT;
-	info->info.scsi.irq		= host->irq;
+	info->info.scsi.irq		= ec->irq;
 	info->info.ifcfg.clockrate	= 40; /* MHz */
 	info->info.ifcfg.select_timeout	= 255;
 	info->info.ifcfg.asyncperiod	= 200; /* ns */
@@ -463,11 +462,11 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 	if (ret)
 		goto out_free;
 
-	ret = request_irq(host->irq, cumanascsi_2_intr,
+	ret = request_irq(ec->irq, cumanascsi_2_intr,
 			  SA_INTERRUPT, "cumanascsi2", info);
 	if (ret) {
 		printk("scsi%d: IRQ%d not free: %d\n",
-		       host->host_no, host->irq, ret);
+		       host->host_no, ec->irq, ret);
 		goto out_release;
 	}
 
@@ -488,7 +487,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, host);
+	free_irq(ec->irq, host);
 
  out_release:
 	fas216_release(host);
@@ -516,7 +515,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, info);
+	free_irq(ec->irq, info);
 
 	iounmap(info->base);
 
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index d0e932371c48..51bde5dcf498 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -545,7 +545,6 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	}
 
 	host->base	  = (unsigned long)base;
-	host->irq	  = ec->irq;
 	host->dma_channel = ec->dma;
 
 	ecard_set_drvdata(ec, host);
@@ -559,7 +558,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	info->info.scsi.io_base		= base + EESOX_FAS216_OFFSET;
 	info->info.scsi.io_shift	= EESOX_FAS216_SHIFT;
-	info->info.scsi.irq		= host->irq;
+	info->info.scsi.irq		= ec->irq;
 	info->info.ifcfg.clockrate	= 40; /* MHz */
 	info->info.ifcfg.select_timeout	= 255;
 	info->info.ifcfg.asyncperiod	= 200; /* ns */
@@ -583,10 +582,10 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	if (ret)
 		goto out_free;
 
-	ret = request_irq(host->irq, eesoxscsi_intr, 0, "eesoxscsi", info);
+	ret = request_irq(ec->irq, eesoxscsi_intr, 0, "eesoxscsi", info);
 	if (ret) {
 		printk("scsi%d: IRQ%d not free: %d\n",
-		       host->host_no, host->irq, ret);
+		       host->host_no, ec->irq, ret);
 		goto out_remove;
 	}
 
@@ -608,7 +607,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, host);
+	free_irq(ec->irq, host);
 
  out_remove:
 	fas216_remove(host);
@@ -637,7 +636,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, info);
+	free_irq(ec->irq, info);
 
 	device_remove_file(&ec->dev, &dev_attr_bus_term);
 
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index b10257eef6e9..3aa02fa54937 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -2971,7 +2971,7 @@ int fas216_print_host(FAS216_Info *info, char *buffer)
 			" IRQ    : %d\n"
 			" DMA    : %d\n",
 			info->scsi.type, info->host->io_port,
-			info->host->irq, info->host->dma_channel);
+			info->scsi.irq, info->host->dma_channel);
 }
 
 int fas216_print_stats(FAS216_Info *info, char *buffer)
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 4a468073213a..b29db2e70412 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -340,7 +340,6 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	}
 
 	host->base	  = (unsigned long)base;
-	host->irq	  = ec->irq;
 	host->dma_channel = ec->dma;
 
 	ecard_set_drvdata(ec, host);
@@ -351,7 +350,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	info->info.scsi.io_base		= base + POWERTEC_FAS216_OFFSET;
 	info->info.scsi.io_shift	= POWERTEC_FAS216_SHIFT;
-	info->info.scsi.irq		= host->irq;
+	info->info.scsi.irq		= ec->irq;
 	info->info.ifcfg.clockrate	= 40; /* MHz */
 	info->info.ifcfg.select_timeout	= 255;
 	info->info.ifcfg.asyncperiod	= 200; /* ns */
@@ -375,11 +374,11 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 	if (ret)
 		goto out_free;
 
-	ret = request_irq(host->irq, powertecscsi_intr,
+	ret = request_irq(ec->irq, powertecscsi_intr,
 			  SA_INTERRUPT, "powertec", info);
 	if (ret) {
 		printk("scsi%d: IRQ%d not free: %d\n",
-		       host->host_no, host->irq, ret);
+		       host->host_no, ec->irq, ret);
 		goto out_release;
 	}
 
@@ -400,7 +399,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, host);
+	free_irq(ec->irq, host);
 
  out_release:
 	fas216_release(host);
@@ -431,7 +430,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
 
 	if (host->dma_channel != NO_DMA)
 		free_dma(host->dma_channel);
-	free_irq(host->irq, info);
+	free_irq(ec->irq, info);
 
 	iounmap(info->base);