[SCSI] hpsa: remove atrophied hpsa_scsi_setup function
authorStephen M. Cameron <scameron@beardog.cce.hp.com>
Tue, 3 May 2011 19:59:41 +0000 (14:59 -0500)
committerJames Bottomley <jbottomley@parallels.com>
Tue, 17 May 2011 07:06:30 +0000 (11:06 +0400)
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>
drivers/scsi/hpsa.c

index 2a90e9a638301de41e78a294728273571accb507..ca92141b773686c14f4f3f75a1fbf00dde26f647 100644 (file)
@@ -929,13 +929,6 @@ static void hpsa_slave_destroy(struct scsi_device *sdev)
        /* nothing to do. */
 }
 
-static void hpsa_scsi_setup(struct ctlr_info *h)
-{
-       h->ndevices = 0;
-       h->scsi_host = NULL;
-       spin_lock_init(&h->devlock);
-}
-
 static void hpsa_free_sg_chain_blocks(struct ctlr_info *h)
 {
        int i;
@@ -3970,7 +3963,9 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
        h->scan_finished = 1; /* no scan currently in progress */
 
        pci_set_drvdata(pdev, h);
-       hpsa_scsi_setup(h);
+       h->ndevices = 0;
+       h->scsi_host = NULL;
+       spin_lock_init(&h->devlock);
 
        /* Turn the interrupts on so we can service requests */
        h->access.set_intr_mask(h, HPSA_INTR_ON);