xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aha1542: Reorder functions to remove forward declarations

Browse Source 
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Ondrej Zary
2015-02-06 23:11:28 +01:00
committed by James Bottomley
parent cb5b570ce3
commit 09a4483388
2 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/scsi/aha1542.c
View File

@@ -124,10 +124,6 @@ static DEFINE_SPINLOCK(aha1542_lock);
#define WAITnexttimeout 3000000 #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) static inline void aha1542_intr_reset(u16 base)
{ {
outb(IRST, CONTROL(base)); outb(IRST, CONTROL(base));
@@ -368,16 +364,20 @@ fail:
return 0; /* 0 = not ok */ return 0; /* 0 = not ok */
} }
/* A quick wrapper for do_aha1542_intr_handle to grab the spin lock */ static int aha1542_restart(struct Scsi_Host *shost)
static irqreturn_t do_aha1542_intr_handle(int dummy, void *dev_id)
{ {
unsigned long flags; struct aha1542_hostdata *aha1542 = shost_priv(shost);
struct Scsi_Host *shost = dev_id; int i;
int count = 0;
spin_lock_irqsave(shost->host_lock, flags); for (i = 0; i < AHA1542_MAILBOXES; i++)
aha1542_intr_handle(shost); if (aha1542->SCint[i] &&
spin_unlock_irqrestore(shost->host_lock, flags); !(aha1542->SCint[i]->device->soft_reset)) {
return IRQ_HANDLED; count++;
}
printk(KERN_DEBUG "Potential to restart %d stalled commands...\n", count);
return 0;
} }
/* A "high" level interrupt handler */ /* 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 *)) static int aha1542_queuecommand_lck(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
{ {
struct aha1542_hostdata *aha1542 = shost_priv(SCpnt->device->host); struct aha1542_hostdata *aha1542 = shost_priv(SCpnt->device->host);
@@ -1078,21 +1090,6 @@ static int aha1542_release(struct Scsi_Host *shost)
return 0; 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 * This is a device reset. This is handled by sending a special command

12
drivers/scsi/aha1542.h
View File

@@ -125,18 +125,6 @@ struct ccb { /* Command Control Block 5.3 */
/* REQUEST SENSE */ /* REQUEST SENSE */
}; };
static struct Scsi_Host *aha1542_hw_init(struct scsi_host_template *tpnt, struct device *pdev, int indx);
static int aha1542_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
static int aha1542_host_reset(Scsi_Cmnd * SCpnt);
#if 0
static int aha1542_old_abort(Scsi_Cmnd * SCpnt);
static int aha1542_old_reset(Scsi_Cmnd *, unsigned int);
#endif
static int aha1542_biosparam(struct scsi_device *, struct block_device *,
sector_t, int *);
#define AHA1542_MAILBOXES 8 #define AHA1542_MAILBOXES 8
#endif #endif