Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48ecddb4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: atp870u: switch to generic DMA API 



Switch from the legacy PCI DMA API to the generic DMA API.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4d431b18

drivers/scsi/atp870u.c

+3 −3
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static void atp870u_free_tables(struct Scsi_Host *host) 
		for (k = 0; k < 16; k++) {

			if (!atp_dev->id[j][k].prd_table)

				continue;

			pci_free_consistent(atp_dev->pdev, 1024, atp_dev->id[j][k].prd_table, atp_dev->id[j][k].prd_bus);

			dma_free_coherent(&atp_dev->pdev->dev, 1024, atp_dev->id[j][k].prd_table, atp_dev->id[j][k].prd_bus);

			atp_dev->id[j][k].prd_table = NULL;

		}

	}
@@ -1205,7 +1205,7 @@ static int atp870u_init_tables(struct Scsi_Host *host) 
	int c,k;

	for(c=0;c < 2;c++) {

	   	for(k=0;k<16;k++) {

	   			atp_dev->id[c][k].prd_table = pci_alloc_consistent(atp_dev->pdev, 1024, &(atp_dev->id[c][k].prd_bus));

				atp_dev->id[c][k].prd_table = dma_alloc_coherent(&atp_dev->pdev->dev, 1024, &(atp_dev->id[c][k].prd_bus), GFP_KERNEL);

	   			if (!atp_dev->id[c][k].prd_table) {

	   				printk("atp870u_init_tables fail\n");

				atp870u_free_tables(host);
@@ -1509,7 +1509,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto fail;



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {

                printk(KERN_ERR "atp870u: DMA mask required but not available.\n");

                err = -EIO;

                goto disable_device;