summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2010-05-27 15:13:38 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 12:01:09 -0500
commitf7c391015ab64c835a9bb403626b38a51d6432cc (patch)
tree8d7cfbf3b49927abfb677129ceb80e13fbd65feb
parent76c46e4970f7ee6d8c54220a767e93d67b74cd33 (diff)
downloadlinux-f7c391015ab64c835a9bb403626b38a51d6432cc.tar.gz
linux-f7c391015ab64c835a9bb403626b38a51d6432cc.tar.bz2
linux-f7c391015ab64c835a9bb403626b38a51d6432cc.zip
[SCSI] hpsa: factor out hpsa_enable_scsi_prefetch
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/hpsa.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f2a9af64dfaa..62f9784ecf8f 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3384,6 +3384,18 @@ static inline bool hpsa_CISS_signature_present(struct ctlr_info *h)
return true;
}
+/* Need to enable prefetch in the SCSI core for 6400 in x86 */
+static inline void hpsa_enable_scsi_prefetch(struct ctlr_info *h)
+{
+#ifdef CONFIG_X86
+ u32 prefetch;
+
+ prefetch = readl(&(h->cfgtable->SCSI_Prefetch));
+ prefetch |= 0x100;
+ writel(prefetch, &(h->cfgtable->SCSI_Prefetch));
+#endif
+}
+
static int __devinit hpsa_pci_init(struct ctlr_info *h)
{
int i, prod_index, err;
@@ -3431,15 +3443,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
err = -ENODEV;
goto err_out_free_res;
}
-#ifdef CONFIG_X86
- {
- /* Need to enable prefetch in the SCSI core for 6400 in x86 */
- u32 prefetch;
- prefetch = readl(&(h->cfgtable->SCSI_Prefetch));
- prefetch |= 0x100;
- writel(prefetch, &(h->cfgtable->SCSI_Prefetch));
- }
-#endif
+ hpsa_enable_scsi_prefetch(h);
/* Disabling DMA prefetch for the P600
* An ASIC bug may result in a prefetch beyond