Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: ioat: Free up __cleanup() name

In order to use __cleanup for __attribute__((__cleanup__(func))) the
name must not be used for anything else. Avoid the conflict.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lkml.kernel.org/r/20230612093537.467120754%40infradead.org

+6 -6
+6 -6
drivers/dma/ioat/dma.c
··· 584 584 } 585 585 586 586 /** 587 - * __cleanup - reclaim used descriptors 587 + * __ioat_cleanup - reclaim used descriptors 588 588 * @ioat_chan: channel (ring) to clean 589 589 * @phys_complete: zeroed (or not) completion address (from status) 590 590 */ 591 - static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) 591 + static void __ioat_cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) 592 592 { 593 593 struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma; 594 594 struct ioat_ring_ent *desc; ··· 675 675 spin_lock_bh(&ioat_chan->cleanup_lock); 676 676 677 677 if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) 678 - __cleanup(ioat_chan, phys_complete); 678 + __ioat_cleanup(ioat_chan, phys_complete); 679 679 680 680 if (is_ioat_halted(*ioat_chan->completion)) { 681 681 u32 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); ··· 712 712 713 713 ioat_quiesce(ioat_chan, 0); 714 714 if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) 715 - __cleanup(ioat_chan, phys_complete); 715 + __ioat_cleanup(ioat_chan, phys_complete); 716 716 717 717 __ioat_restart_chan(ioat_chan); 718 718 } ··· 786 786 787 787 /* cleanup so tail points to descriptor that caused the error */ 788 788 if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) 789 - __cleanup(ioat_chan, phys_complete); 789 + __ioat_cleanup(ioat_chan, phys_complete); 790 790 791 791 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); 792 792 pci_read_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, &chanerr_int); ··· 943 943 /* timer restarted in ioat_cleanup_preamble 944 944 * and IOAT_COMPLETION_ACK cleared 945 945 */ 946 - __cleanup(ioat_chan, phys_complete); 946 + __ioat_cleanup(ioat_chan, phys_complete); 947 947 goto unlock_out; 948 948 } 949 949