From: Finn Thain Date: Sun, 3 Jan 2016 05:05:20 +0000 (+1100) Subject: ncr5380: Cleanup bogus {request,release}_region() calls X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e52bbd5ccf53d2a73e524adb26b6d8a4f810ccb4;p=linux-beck.git 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 Reviewed-by: Hannes Reinecke Signed-off-by: Martin K. Petersen --- 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, 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) { 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) 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; 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) 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; } 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) 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;