From bed1d1329b45244da98d6417395eb00c2a436401 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 4 Feb 2010 08:43:11 -0600
Subject: [PATCH] --- yaml --- r: 181335 b: refs/heads/master c:
 a23513e8413e02b7e34e96a03d6bfd1c1948ac00 h: refs/heads/master i:   181333:
 9c644baed322d891aa6bff7d3782c72603e40bab   181331:
 2f6a1ceee9b3ace1f5ed4f37a322c5144712c327   181327:
 0fb4bf3544437c2c1eafacafe1e8c633d7048121 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 982806ab4f55..d81fdc189730 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01fb21870d96c83ae01072674e380ac51ebc58c8
+refs/heads/master: a23513e8413e02b7e34e96a03d6bfd1c1948ac00
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 320d6863c44e..e81df76df821 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -197,6 +197,12 @@ static inline struct ctlr_info *sdev_to_hba(struct scsi_device *sdev)
 	return (struct ctlr_info *) *priv;
 }
 
+static inline struct ctlr_info *shost_to_hba(struct Scsi_Host *sh)
+{
+	unsigned long *priv = shost_priv(sh);
+	return (struct ctlr_info *) *priv;
+}
+
 static struct task_struct *hpsa_scan_thread;
 static DEFINE_MUTEX(hpsa_scan_mutex);
 static LIST_HEAD(hpsa_scan_q);
@@ -381,8 +387,7 @@ static ssize_t host_store_rescan(struct device *dev,
 {
 	struct ctlr_info *h;
 	struct Scsi_Host *shost = class_to_shost(dev);
-	unsigned long *priv = shost_priv(shost);
-	h = (struct ctlr_info *) *priv;
+	h = shost_to_hba(shost);
 	if (add_to_scan_list(h)) {
 		wake_up_process(hpsa_scan_thread);
 		wait_for_completion_interruptible(&h->scan_wait);