|
@@ -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);
|