aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/hpsa.c
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2011-05-03 15:59:41 -0400
committerJames Bottomley <jbottomley@parallels.com>2011-05-17 03:06:30 -0400
commit9a41338e5b474add499a7ca2a5a76148e5076805 (patch)
treea1bc432995704b1c5ab9e57af335bc3c5408b260 /drivers/scsi/hpsa.c
parent2b870cb30000477e425666f9c6d83cca8fddc7c0 (diff)
[SCSI] hpsa: remove atrophied hpsa_scsi_setup function
hpsa_scsi_setup at one time contained enough code to justify its existence, but that time has passed. Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <jbottomley@parallels.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/hpsa.c')
-rw-r--r--drivers/scsi/hpsa.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 2a90e9a63830..ca92141b7736 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -929,13 +929,6 @@ static void hpsa_slave_destroy(struct scsi_device *sdev)
929 /* nothing to do. */ 929 /* nothing to do. */
930} 930}
931 931
932static void hpsa_scsi_setup(struct ctlr_info *h)
933{
934 h->ndevices = 0;
935 h->scsi_host = NULL;
936 spin_lock_init(&h->devlock);
937}
938
939static void hpsa_free_sg_chain_blocks(struct ctlr_info *h) 932static void hpsa_free_sg_chain_blocks(struct ctlr_info *h)
940{ 933{
941 int i; 934 int i;
@@ -3970,7 +3963,9 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
3970 h->scan_finished = 1; /* no scan currently in progress */ 3963 h->scan_finished = 1; /* no scan currently in progress */
3971 3964
3972 pci_set_drvdata(pdev, h); 3965 pci_set_drvdata(pdev, h);
3973 hpsa_scsi_setup(h); 3966 h->ndevices = 0;
3967 h->scsi_host = NULL;
3968 spin_lock_init(&h->devlock);
3974 3969
3975 /* Turn the interrupts on so we can service requests */ 3970 /* Turn the interrupts on so we can service requests */
3976 h->access.set_intr_mask(h, HPSA_INTR_ON); 3971 h->access.set_intr_mask(h, HPSA_INTR_ON);