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

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

scsi: 3w-9xxx: fully convert to the generic DMA API 



The driver is currently using an odd mix of legacy PCI DMA API and
generic DMA API calls, switch it over to the generic API entirely.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarAdam Radford <aradford@gmail.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3a21986f

drivers/scsi/3w-9xxx.c

+24 −26
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ static int twa_allocate_memory(TW_Device_Extension *tw_dev, int size, int which) 
	unsigned long *cpu_addr;

	int retval = 1;



	cpu_addr = pci_alloc_consistent(tw_dev->tw_pci_dev, size*TW_Q_LENGTH, &dma_handle);

	cpu_addr = dma_alloc_coherent(&tw_dev->tw_pci_dev->dev,

			size * TW_Q_LENGTH, &dma_handle, GFP_KERNEL);

	if (!cpu_addr) {

		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x5, "Memory allocation failed");

		goto out;
@@ -526,7 +527,8 @@ static int twa_allocate_memory(TW_Device_Extension *tw_dev, int size, int which) 


	if ((unsigned long)cpu_addr % (TW_ALIGNMENT_9000)) {

		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x6, "Failed to allocate correctly aligned memory");

		pci_free_consistent(tw_dev->tw_pci_dev, size*TW_Q_LENGTH, cpu_addr, dma_handle);

		dma_free_coherent(&tw_dev->tw_pci_dev->dev, size * TW_Q_LENGTH,

				cpu_addr, dma_handle);

		goto out;

	}
@@ -1027,13 +1029,13 @@ static int twa_fill_sense(TW_Device_Extension *tw_dev, int request_id, int copy_ 
static void twa_free_device_extension(TW_Device_Extension *tw_dev)

{

	if (tw_dev->command_packet_virt[0])

		pci_free_consistent(tw_dev->tw_pci_dev,

		dma_free_coherent(&tw_dev->tw_pci_dev->dev,

				sizeof(TW_Command_Full) * TW_Q_LENGTH,

				tw_dev->command_packet_virt[0],

				tw_dev->command_packet_phys[0]);



	if (tw_dev->generic_buffer_virt[0])

		pci_free_consistent(tw_dev->tw_pci_dev,

		dma_free_coherent(&tw_dev->tw_pci_dev->dev,

				TW_SECTOR_SIZE * TW_Q_LENGTH,

				tw_dev->generic_buffer_virt[0],

				tw_dev->generic_buffer_phys[0]);
@@ -2015,10 +2017,8 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) 
	pci_set_master(pdev);

	pci_try_set_mwi(pdev);



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))

	    || pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))

		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))

		    || pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {

		TW_PRINTK(host, TW_DRIVER, 0x23, "Failed to set dma mask");

		retval = -ENODEV;

		goto out_disable_device;
@@ -2237,10 +2237,8 @@ static int twa_resume(struct pci_dev *pdev) 
	pci_set_master(pdev);

	pci_try_set_mwi(pdev);



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))

	    || pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))

		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))

		    || pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {

		TW_PRINTK(host, TW_DRIVER, 0x40, "Failed to set dma mask during resume");

		retval = -ENODEV;

		goto out_disable_device;