Commit 76a334d7 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Martin K. Petersen
Browse files

scsi: message: fusion: mptsas: Use dma_alloc_coherent() 

In [1], Christoph Hellwig has proposed to remove the wrappers in
include/linux/pci-dma-compat.h.

Some reasons why this API should be removed have been given by Julia
Lawall in [2].

In all these places where some memory is allocated GFP_KERNEL can be used
because they already call mpt_config() which has an explicit might_sleep().

[1]: https://lore.kernel.org/kernel-janitors/20200421081257.GA131897@infradead.org/
[2]: https://lore.kernel.org/kernel-janitors/alpine.DEB.2.22.394.2007120902170.2424@hadrien/

Link: https://lore.kernel.org/r/443b81ecb08b2fe6f789bb2fdff13a53c809e401.1641500561.git.christophe.jaillet@wanadoo.fr


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7a960b3a

drivers/message/fusion/mptsas.c

+20 −20
Original line number Diff line number Diff line
@@ -702,8 +702,8 @@ mptsas_add_device_component_starget_ir(MPT_ADAPTER *ioc, 
	if (!hdr.PageLength)

		goto out;



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.PageLength * 4,

	    &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.PageLength * 4,

				    &dma_handle, GFP_KERNEL);



	if (!buffer)

		goto out;
@@ -1399,8 +1399,8 @@ mptsas_sas_enclosure_pg0(MPT_ADAPTER *ioc, struct mptsas_enclosure *enclosure, 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

			&dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2058,8 +2058,8 @@ static int mptsas_get_linkerrors(struct sas_phy *phy) 
	if (!hdr.ExtPageLength)

		return -ENXIO;



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

				      &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;
@@ -2412,8 +2412,8 @@ mptsas_sas_io_unit_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info) 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

					    &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2487,8 +2487,8 @@ mptsas_sas_io_unit_pg1(MPT_ADAPTER *ioc) 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

					    &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2551,8 +2551,8 @@ mptsas_sas_phy_pg0(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

				      &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2614,8 +2614,8 @@ mptsas_sas_device_pg0(MPT_ADAPTER *ioc, struct mptsas_devinfo *device_info, 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

				      &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2697,8 +2697,8 @@ mptsas_sas_expander_pg0(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info, 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

				      &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -2777,8 +2777,8 @@ mptsas_sas_expander_pg1(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, 
		goto out;

	}



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.ExtPageLength * 4,

				      &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.ExtPageLength * 4,

				    &dma_handle, GFP_KERNEL);

	if (!buffer) {

		error = -ENOMEM;

		goto out;
@@ -4273,8 +4273,8 @@ mptsas_adding_inactive_raid_components(MPT_ADAPTER *ioc, u8 channel, u8 id) 
	if (!hdr.PageLength)

		goto out;



	buffer = pci_alloc_consistent(ioc->pcidev, hdr.PageLength * 4,

	    &dma_handle);

	buffer = dma_alloc_coherent(&ioc->pcidev->dev, hdr.PageLength * 4,

				    &dma_handle, GFP_KERNEL);



	if (!buffer)

		goto out;