eata: remove driver_lock

port_detect is only called from the module_init routine and thus implicitly
serialized, so remove the driver lock which was held over potentially
sleeping function calls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
Tested-by: Arthur Marsh <arthur.marsh@internode.on.net>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 813dd5c998e44ac6a3d8ba32280fc9bc57148c25..943ad3a19661a4a00fba774ba4d9d978bf5d3d41 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -837,7 +837,6 @@ struct hostdata {
 static struct Scsi_Host *sh[MAX_BOARDS];
 static const char *driver_name = "EATA";
 static char sha[MAX_BOARDS];
-static DEFINE_SPINLOCK(driver_lock);
 
 /* Initialize num_boards so that ihdlr can work while detect is in progress */
 static unsigned int num_boards = MAX_BOARDS;
@@ -1097,8 +1096,6 @@ static int port_detect(unsigned long port_base, unsigned int j,
                goto fail;
        }
 
-       spin_lock_irq(&driver_lock);
-
        if (do_dma(port_base, 0, READ_CONFIG_PIO)) {
 #if defined(DEBUG_DETECT)
                printk("%s: detect, do_dma failed at 0x%03lx.\n", name,
@@ -1264,10 +1261,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
        }
 #endif
 
-       spin_unlock_irq(&driver_lock);
        sh[j] = shost = scsi_register(tpnt, sizeof(struct hostdata));
-       spin_lock_irq(&driver_lock);
-
        if (shost == NULL) {
                printk("%s: unable to register host, detaching.\n", name);
                goto freedma;
@@ -1344,8 +1338,6 @@ static int port_detect(unsigned long port_base, unsigned int j,
        else
                sprintf(dma_name, "DMA %u", dma_channel);
 
-       spin_unlock_irq(&driver_lock);
-
        for (i = 0; i < shost->can_queue; i++)
                ha->cp[i].cp_dma_addr = pci_map_single(ha->pdev,
                                                          &ha->cp[i],
@@ -1438,7 +1430,6 @@ static int port_detect(unsigned long port_base, unsigned int j,
       freeirq:
        free_irq(irq, &sha[j]);
       freelock:
-       spin_unlock_irq(&driver_lock);
        release_region(port_base, REGION_SIZE);
       fail:
        return 0;