diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 00:05:20 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:42:55 -0500 |
commit | e52bbd5ccf53d2a73e524adb26b6d8a4f810ccb4 (patch) | |
tree | 8661df0ae59be9448097a9fbe2c3d93dd37b7db5 /drivers/scsi | |
parent | 4d029e9ae9c382b149b16632f49970d8b215e2da (diff) |
ncr5380: Cleanup bogus {request,release}_region() calls
Commit 8b801ead3d7a ("[ARM] rpc: update Acorn SCSI drivers to modern ecard
interfaces") neglected to remove a request_region() call in cumana_1.c.
Commit eda32612f7b2 ("[PATCH] give all LLDD driver a ->release method") in
history/history.git added some pointless release_region() calls in dtc.c,
pas16.c and t128.c.
Fix these issues.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/arm/cumana_1.c | 6 | ||||
-rw-r--r-- | drivers/scsi/dtc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pas16.c | 2 | ||||
-rw-r--r-- | drivers/scsi/t128.c | 2 |
4 files changed, 0 insertions, 12 deletions
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index c7dc65e39cdb..3b5ff105f1d6 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c | |||
@@ -245,12 +245,6 @@ static int cumanascsi1_probe(struct expansion_card *ec, | |||
245 | priv(host)->ctrl = 0; | 245 | priv(host)->ctrl = 0; |
246 | writeb(0, priv(host)->base + CTRL); | 246 | writeb(0, priv(host)->base + CTRL); |
247 | 247 | ||
248 | host->n_io_port = 255; | ||
249 | if (!(request_region(host->io_port, host->n_io_port, "CumanaSCSI-1"))) { | ||
250 | ret = -EBUSY; | ||
251 | goto out_unmap; | ||
252 | } | ||
253 | |||
254 | ret = request_irq(host->irq, cumanascsi_intr, 0, | 248 | ret = request_irq(host->irq, cumanascsi_intr, 0, |
255 | "CumanaSCSI-1", host); | 249 | "CumanaSCSI-1", host); |
256 | if (ret) { | 250 | if (ret) { |
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 02a5532f4267..698bea067af9 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c | |||
@@ -423,8 +423,6 @@ static int dtc_release(struct Scsi_Host *shost) | |||
423 | if (shost->irq != NO_IRQ) | 423 | if (shost->irq != NO_IRQ) |
424 | free_irq(shost->irq, shost); | 424 | free_irq(shost->irq, shost); |
425 | NCR5380_exit(shost); | 425 | NCR5380_exit(shost); |
426 | if (shost->io_port && shost->n_io_port) | ||
427 | release_region(shost->io_port, shost->n_io_port); | ||
428 | scsi_unregister(shost); | 426 | scsi_unregister(shost); |
429 | iounmap(hostdata->base); | 427 | iounmap(hostdata->base); |
430 | return 0; | 428 | return 0; |
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c index c316ff7ffef6..e5c76eefa5e0 100644 --- a/drivers/scsi/pas16.c +++ b/drivers/scsi/pas16.c | |||
@@ -540,8 +540,6 @@ static int pas16_release(struct Scsi_Host *shost) | |||
540 | if (shost->irq != NO_IRQ) | 540 | if (shost->irq != NO_IRQ) |
541 | free_irq(shost->irq, shost); | 541 | free_irq(shost->irq, shost); |
542 | NCR5380_exit(shost); | 542 | NCR5380_exit(shost); |
543 | if (shost->io_port && shost->n_io_port) | ||
544 | release_region(shost->io_port, shost->n_io_port); | ||
545 | scsi_unregister(shost); | 543 | scsi_unregister(shost); |
546 | return 0; | 544 | return 0; |
547 | } | 545 | } |
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c index d5e6b676d75e..3adcae1150d2 100644 --- a/drivers/scsi/t128.c +++ b/drivers/scsi/t128.c | |||
@@ -255,8 +255,6 @@ static int t128_release(struct Scsi_Host *shost) | |||
255 | if (shost->irq != NO_IRQ) | 255 | if (shost->irq != NO_IRQ) |
256 | free_irq(shost->irq, shost); | 256 | free_irq(shost->irq, shost); |
257 | NCR5380_exit(shost); | 257 | NCR5380_exit(shost); |
258 | if (shost->io_port && shost->n_io_port) | ||
259 | release_region(shost->io_port, shost->n_io_port); | ||
260 | scsi_unregister(shost); | 258 | scsi_unregister(shost); |
261 | iounmap(hostdata->base); | 259 | iounmap(hostdata->base); |
262 | return 0; | 260 | return 0; |