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 <fth...@telegraphics.com.au>

---
 drivers/scsi/arm/cumana_1.c |    6 ------
 drivers/scsi/dtc.c          |    2 --
 drivers/scsi/pas16.c        |    2 --
 drivers/scsi/t128.c         |    2 --
 4 files changed, 12 deletions(-)

Index: linux/drivers/scsi/arm/cumana_1.c
===================================================================
--- linux.orig/drivers/scsi/arm/cumana_1.c      2015-12-22 12:15:35.000000000 
+1100
+++ linux/drivers/scsi/arm/cumana_1.c   2015-12-22 12:15:54.000000000 +1100
@@ -245,12 +245,6 @@ static int cumanascsi1_probe(struct expa
         priv(host)->ctrl = 0;
         writeb(0, priv(host)->base + CTRL);
 
-       host->n_io_port = 255;
-       if (!(request_region(host->io_port, host->n_io_port, "CumanaSCSI-1"))) {
-               ret = -EBUSY;
-               goto out_unmap;
-       }
-
        ret = request_irq(host->irq, cumanascsi_intr, 0,
                          "CumanaSCSI-1", host);
        if (ret) {
Index: linux/drivers/scsi/dtc.c
===================================================================
--- linux.orig/drivers/scsi/dtc.c       2015-12-22 12:15:35.000000000 +1100
+++ linux/drivers/scsi/dtc.c    2015-12-22 12:15:54.000000000 +1100
@@ -423,8 +423,6 @@ static int dtc_release(struct Scsi_Host
        if (shost->irq != NO_IRQ)
                free_irq(shost->irq, shost);
        NCR5380_exit(shost);
-       if (shost->io_port && shost->n_io_port)
-               release_region(shost->io_port, shost->n_io_port);
        scsi_unregister(shost);
        iounmap(hostdata->base);
        return 0;
Index: linux/drivers/scsi/pas16.c
===================================================================
--- linux.orig/drivers/scsi/pas16.c     2015-12-22 12:15:35.000000000 +1100
+++ linux/drivers/scsi/pas16.c  2015-12-22 12:15:54.000000000 +1100
@@ -540,8 +540,6 @@ static int pas16_release(struct Scsi_Hos
        if (shost->irq != NO_IRQ)
                free_irq(shost->irq, shost);
        NCR5380_exit(shost);
-       if (shost->io_port && shost->n_io_port)
-               release_region(shost->io_port, shost->n_io_port);
        scsi_unregister(shost);
        return 0;
 }
Index: linux/drivers/scsi/t128.c
===================================================================
--- linux.orig/drivers/scsi/t128.c      2015-12-22 12:15:35.000000000 +1100
+++ linux/drivers/scsi/t128.c   2015-12-22 12:15:54.000000000 +1100
@@ -255,8 +255,6 @@ static int t128_release(struct Scsi_Host
        if (shost->irq != NO_IRQ)
                free_irq(shost->irq, shost);
        NCR5380_exit(shost);
-       if (shost->io_port && shost->n_io_port)
-               release_region(shost->io_port, shost->n_io_port);
        scsi_unregister(shost);
        iounmap(hostdata->base);
        return 0;


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to