lkml.org 
[lkml]   [2022]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/16] rapidio/tsi721: Remove usage of the deprecated "pci-dma-compat.h" API
    Date
    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].

    A coccinelle script has been used to perform the needed transformation.
    It can be found in [3].

    [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/
    [3]: https://lore.kernel.org/kernel-janitors/20200716192821.321233-1-christophe.jaillet@wanadoo.fr/

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    ---
    drivers/rapidio/devices/tsi721.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
    index 4dd31dd9feea..b3134744fb55 100644
    --- a/drivers/rapidio/devices/tsi721.c
    +++ b/drivers/rapidio/devices/tsi721.c
    @@ -2836,17 +2836,17 @@ static int tsi721_probe(struct pci_dev *pdev,
    }

    /* Configure DMA attributes. */
    - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
    - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
    + if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
    + err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
    if (err) {
    tsi_err(&pdev->dev, "Unable to set DMA mask");
    goto err_unmap_bars;
    }

    - if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
    + if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)))
    tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
    } else {
    - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
    + err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
    if (err)
    tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
    }
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-01-06 22:53    [W:2.195 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site