aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2010-05-27 16:14:24 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 13:01:15 -0400
commit873f339fc53750c1e715f5e1d2dfdb9869b7ea3f (patch)
tree9b599ca1dc72ecfdc25967fccab3ddb6d0a9c74b
parent6c311b5725b9500bdd0f527cd97496b11999fbbd (diff)
[SCSI] hpsa: remove unused firm_ver member of the per-hba structure
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.c6
-rw-r--r--drivers/scsi/hpsa.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 3c51544db958..50fddf84e47f 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1440,12 +1440,6 @@ static int hpsa_update_device_info(struct ctlr_info *h,
1440 goto bail_out; 1440 goto bail_out;
1441 } 1441 }
1442 1442
1443 /* As a side effect, record the firmware version number
1444 * if we happen to be talking to the RAID controller.
1445 */
1446 if (is_hba_lunid(scsi3addr))
1447 memcpy(h->firm_ver, &inq_buff[32], 4);
1448
1449 this_device->devtype = (inq_buff[0] & 0x1f); 1443 this_device->devtype = (inq_buff[0] & 0x1f);
1450 memcpy(this_device->scsi3addr, scsi3addr, 8); 1444 memcpy(this_device->scsi3addr, scsi3addr, 8);
1451 memcpy(this_device->vendor, &inq_buff[8], 1445 memcpy(this_device->vendor, &inq_buff[8],
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
index 1bb5233b09a0..a203ef65cb50 100644
--- a/drivers/scsi/hpsa.h
+++ b/drivers/scsi/hpsa.h
@@ -53,7 +53,6 @@ struct ctlr_info {
53 int ctlr; 53 int ctlr;
54 char devname[8]; 54 char devname[8];
55 char *product_name; 55 char *product_name;
56 char firm_ver[4]; /* Firmware version */
57 struct pci_dev *pdev; 56 struct pci_dev *pdev;
58 u32 board_id; 57 u32 board_id;
59 void __iomem *vaddr; 58 void __iomem *vaddr;