be2iscsi : Bump the driver version

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / eata.c

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 03372cff38f39b3caef6ff47b36cd04c5bf79c6c..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,
@@ -1238,8 +1235,8 @@ static int port_detect(unsigned long port_base, unsigned int j,
                struct eata_config *cf;
                dma_addr_t cf_dma_addr;
 
-               cf = pci_alloc_consistent(pdev, sizeof(struct eata_config),
-                                         &cf_dma_addr);
+               cf = pci_zalloc_consistent(pdev, sizeof(struct eata_config),
+                                          &cf_dma_addr);
 
                if (!cf) {
                        printk
@@ -1249,7 +1246,6 @@ static int port_detect(unsigned long port_base, unsigned int j,
                }
 
                /* Set board configuration */
-               memset((char *)cf, 0, sizeof(struct eata_config));
                cf->len = (ushort) H2DEV16((ushort) 510);
                cf->ocena = 1;
 
@@ -1265,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;
@@ -1345,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],
@@ -1439,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;