thermal: rockchip: rk3368: ajust tsadc's data path according request of qos

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

diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index aec3d4da276fc1489880f901b3a43f997073bc98..71e1380443797d7ed38d26dba6f01d335b4068bb 100644 (file)
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -594,8 +594,6 @@ static void gdth_pci_remove_one(struct pci_dev *pdev)
 {
        gdth_ha_str *ha = pci_get_drvdata(pdev);
 
-       pci_set_drvdata(pdev, NULL);
-
        list_del(&ha->list);
        gdth_remove_one(ha);
 
@@ -2161,7 +2159,7 @@ static void gdth_next(gdth_ha_str *ha)
               case VERIFY:
               case START_STOP:
               case MODE_SENSE:
-              case SERVICE_ACTION_IN:
+              case SERVICE_ACTION_IN_16:
                 TRACE(("cache cmd %x/%x/%x/%x/%x/%x\n",nscp->cmnd[0],
                        nscp->cmnd[1],nscp->cmnd[2],nscp->cmnd[3],
                        nscp->cmnd[4],nscp->cmnd[5]));
@@ -2393,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)
         gdth_copy_internal_data(ha, scp, (char*)&rdc, sizeof(gdth_rdcap_data));
         break;
 
-      case SERVICE_ACTION_IN:
+      case SERVICE_ACTION_IN_16:
         if ((scp->cmnd[1] & 0x1f) == SAI_READ_CAPACITY_16 &&
             (ha->cache_feat & GDT_64BIT)) {
             gdth_rdcap16_data rdc16;
@@ -4663,7 +4661,6 @@ static void gdth_flush(gdth_ha_str *ha)
 /* configure lun */
 static int gdth_slave_configure(struct scsi_device *sdev)
 {
-    scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
     sdev->skip_ms_page_3f = 1;
     sdev->skip_ms_page_8 = 1;
     return 0;
@@ -4713,7 +4710,7 @@ static int __init gdth_isa_probe_one(u32 isa_bios)
        printk("Configuring GDT-ISA HA at BIOS 0x%05X IRQ %u DRQ %u\n",
                isa_bios, ha->irq, ha->drq);
 
-       error = request_irq(ha->irq, gdth_interrupt, IRQF_DISABLED, "gdth", ha);
+       error = request_irq(ha->irq, gdth_interrupt, 0, "gdth", ha);
        if (error) {
                printk("GDT-ISA: Unable to allocate IRQ\n");
                goto out_host_put;
@@ -4845,7 +4842,7 @@ static int __init gdth_eisa_probe_one(u16 eisa_slot)
        printk("Configuring GDT-EISA HA at Slot %d IRQ %u\n",
                eisa_slot >> 12, ha->irq);
 
-       error = request_irq(ha->irq, gdth_interrupt, IRQF_DISABLED, "gdth", ha);
+       error = request_irq(ha->irq, gdth_interrupt, 0, "gdth", ha);
        if (error) {
                printk("GDT-EISA: Unable to allocate IRQ\n");
                goto out_host_put;
@@ -4981,7 +4978,7 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, gdth_ha_str **ha_out)
                ha->irq);
 
        error = request_irq(ha->irq, gdth_interrupt,
-                               IRQF_DISABLED|IRQF_SHARED, "gdth", ha);
+                               IRQF_SHARED, "gdth", ha);
        if (error) {
                printk("GDT-PCI: Unable to allocate IRQ\n");
                goto out_host_put;