Re: [PATCH] x86/PCI: sta2x11: switch from 'pci_' to 'dma_' API

[Bjorn Helgaas]

[+cc Christoph]

On Sun, Aug 22, 2021 at 08:49:20PM +0200, Christophe JAILLET wrote:
> The wrappers in include/linux/pci-dma-compat.h should go away.
> ...

> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>

Applied to pci/misc for v5.15, thanks!

> ---
> If needed, see post from Christoph Hellwig on the kernel-janitors ML:
>    https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
> ---
>  arch/x86/pci/sta2x11-fixup.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
> index 7d2525691854..101081ad64b6 100644
> --- a/arch/x86/pci/sta2x11-fixup.c
> +++ b/arch/x86/pci/sta2x11-fixup.c
> @@ -146,8 +146,7 @@ static void sta2x11_map_ep(struct pci_dev *pdev)
>  		dev_err(dev, "sta2x11: could not set DMA offset\n");
>  
>  	dev->bus_dma_limit = max_amba_addr;
> -	pci_set_consistent_dma_mask(pdev, max_amba_addr);
> -	pci_set_dma_mask(pdev, max_amba_addr);
> +	dma_set_mask_and_coherent(&pdev->dev, max_amba_addr);
>  
>  	/* Configure AHB mapping */
>  	pci_write_config_dword(pdev, AHB_PEXLBASE(0), 0);
> -- 
> 2.30.2
>