diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2015-02-07 01:11:28 +0300 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-04-10 04:06:47 +0300 |
| commit | 09a44833887dfc856facff0a9b21f3def0367f0c (patch) | |
| tree | 93098a7ae60e9f6c5fa469ae5515cde5abdf84c8 /drivers/scsi/aha1542.c | |
| parent | cb5b570ce3cc7e91f47339e60efba75a4bbc347c (diff) | |
| download | linux-09a44833887dfc856facff0a9b21f3def0367f0c.tar.xz | |
aha1542: Reorder functions to remove forward declarations
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi/aha1542.c')
| -rw-r--r-- | drivers/scsi/aha1542.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 8851719d8d0e..af1e8fa41413 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -124,10 +124,6 @@ static DEFINE_SPINLOCK(aha1542_lock); #define WAITnexttimeout 3000000 -static void setup_mailboxes(int base_io, struct Scsi_Host *shpnt); -static int aha1542_restart(struct Scsi_Host *shost); -static void aha1542_intr_handle(struct Scsi_Host *shost); - static inline void aha1542_intr_reset(u16 base) { outb(IRST, CONTROL(base)); @@ -368,16 +364,20 @@ fail: return 0; /* 0 = not ok */ } -/* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */ -static irqreturn_t do_aha1542_intr_handle(int dummy, void *dev_id) +static int aha1542_restart(struct Scsi_Host *shost) { - unsigned long flags; - struct Scsi_Host *shost = dev_id; + struct aha1542_hostdata *aha1542 = shost_priv(shost); + int i; + int count = 0; - spin_lock_irqsave(shost->host_lock, flags); - aha1542_intr_handle(shost); - spin_unlock_irqrestore(shost->host_lock, flags); - return IRQ_HANDLED; + for (i = 0; i < AHA1542_MAILBOXES; i++) + if (aha1542->SCint[i] && + !(aha1542->SCint[i]->device->soft_reset)) { + count++; + } + printk(KERN_DEBUG "Potential to restart %d stalled commands...\n", count); + + return 0; } /* A "high" level interrupt handler */ @@ -539,6 +539,18 @@ static void aha1542_intr_handle(struct Scsi_Host *shost) }; } +/* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */ +static irqreturn_t do_aha1542_intr_handle(int dummy, void *dev_id) +{ + unsigned long flags; + struct Scsi_Host *shost = dev_id; + + spin_lock_irqsave(shost->host_lock, flags); + aha1542_intr_handle(shost); + spin_unlock_irqrestore(shost->host_lock, flags); + return IRQ_HANDLED; +} + static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *)) { struct aha1542_hostdata *aha1542 = shost_priv(SCpnt->device->host); @@ -1078,21 +1090,6 @@ static int aha1542_release(struct Scsi_Host *shost) return 0; } -static int aha1542_restart(struct Scsi_Host *shost) -{ - struct aha1542_hostdata *aha1542 = shost_priv(shost); - int i; - int count = 0; - - for (i = 0; i < AHA1542_MAILBOXES; i++) - if (aha1542->SCint[i] && - !(aha1542->SCint[i]->device->soft_reset)) { - count++; - } - printk(KERN_DEBUG "Potential to restart %d stalled commands...\n", count); - - return 0; -} /* * This is a device reset. This is handled by sending a special command |