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 02/16] floppy: 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>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    ---
    Reviewed in: https://lore.kernel.org/kernel-janitors/YdLAqi+WQu4ZhAxE@infradead.org/
    ---
    arch/powerpc/include/asm/floppy.h | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h
    index 7af9a68fd949..f8ce178b43b7 100644
    --- a/arch/powerpc/include/asm/floppy.h
    +++ b/arch/powerpc/include/asm/floppy.h
    @@ -134,17 +134,19 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
    int dir;

    doing_vdma = 0;
    - dir = (mode == DMA_MODE_READ) ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE;
    + dir = (mode == DMA_MODE_READ) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;

    if (bus_addr
    && (addr != prev_addr || size != prev_size || dir != prev_dir)) {
    /* different from last time -- unmap prev */
    - pci_unmap_single(isa_bridge_pcidev, bus_addr, prev_size, prev_dir);
    + dma_unmap_single(&isa_bridge_pcidev->dev, bus_addr, prev_size,
    + prev_dir);
    bus_addr = 0;
    }

    if (!bus_addr) /* need to map it */
    - bus_addr = pci_map_single(isa_bridge_pcidev, addr, size, dir);
    + bus_addr = dma_map_single(&isa_bridge_pcidev->dev, addr, size,
    + dir);

    /* remember this one as prev */
    prev_addr = addr;
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-01-06 22:48    [W:2.358 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site