Skip to content

Commit 7a960b3

Browse files
tititiou36martinkpetersen
authored andcommitted
scsi: message: fusion: Use dma_alloc_coherent() in mptsas_exp_repmanufacture_info()
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]. The only caller of mptsas_exp_repmanufacture_info() is mptsas_probe_one_phy(). This function already calls sas_end_device_alloc() or sas_expander_alloc(). They both already use GFP_KERNEL. As no spin_lock is held at this point, it is safe to also use GFP_KERNEL here. [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/d78d4a5b096897932808ed7e3a4540db1687c25d.1641500561.git.christophe.jaillet@wanadoo.fr Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 5c5e6b6 commit 7a960b3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/message/fusion/mptsas.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2896,7 +2896,8 @@ mptsas_exp_repmanufacture_info(MPT_ADAPTER *ioc,
28962896

28972897
sz = sizeof(struct rep_manu_request) + sizeof(struct rep_manu_reply);
28982898

2899-
data_out = pci_alloc_consistent(ioc->pcidev, sz, &data_out_dma);
2899+
data_out = dma_alloc_coherent(&ioc->pcidev->dev, sz, &data_out_dma,
2900+
GFP_KERNEL);
29002901
if (!data_out) {
29012902
printk(KERN_ERR "Memory allocation failure at %s:%d/%s()!\n",
29022903
__FILE__, __LINE__, __func__);

0 commit comments

Comments
 (0)