OSDN Git Service

scsi: 53c700: switch to dma_alloc_attrs
authorChristoph Hellwig <hch@lst.de>
Fri, 16 Jun 2017 07:17:12 +0000 (09:17 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 26 Jun 2017 19:01:05 +0000 (15:01 -0400)
Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent
wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/53c700.c

index 95e32a4..4b3b080 100644 (file)
@@ -296,8 +296,8 @@ NCR_700_detect(struct scsi_host_template *tpnt,
        if(tpnt->sdev_attrs == NULL)
                tpnt->sdev_attrs = NCR_700_dev_attrs;
 
-       memory = dma_alloc_noncoherent(hostdata->dev, TOTAL_MEM_SIZE,
-                                      &pScript, GFP_KERNEL);
+       memory = dma_alloc_attrs(hostdata->dev, TOTAL_MEM_SIZE, &pScript,
+                                GFP_KERNEL, DMA_ATTR_NON_CONSISTENT);
        if(memory == NULL) {
                printk(KERN_ERR "53c700: Failed to allocate memory for driver, detaching\n");
                return NULL;
@@ -410,8 +410,8 @@ NCR_700_release(struct Scsi_Host *host)
        struct NCR_700_Host_Parameters *hostdata = 
                (struct NCR_700_Host_Parameters *)host->hostdata[0];
 
-       dma_free_noncoherent(hostdata->dev, TOTAL_MEM_SIZE,
-                              hostdata->script, hostdata->pScript);
+       dma_free_attrs(hostdata->dev, TOTAL_MEM_SIZE, hostdata->script,
+                      hostdata->pScript, DMA_ATTR_NON_CONSISTENT);
        return 1;
 }