Skip to content

Commit cf36a5c

Browse files
committed
dmaengine: ioat: Free up __cleanup() name
Bugzilla: https://bugzilla.redhat.com/2216526 commit f62141a Author: Peter Zijlstra <peterz@infradead.org> Date: Tue Sep 27 11:32:41 2022 +0200 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 Signed-off-by: Wander Lairson Costa <wander@redhat.com>
1 parent b1bfbb8 commit cf36a5c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/dma/ioat/dma.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -584,11 +584,11 @@ desc_get_errstat(struct ioatdma_chan *ioat_chan, struct ioat_ring_ent *desc)
584584
}
585585

586586
/**
587-
* __cleanup - reclaim used descriptors
587+
* __ioat_cleanup - reclaim used descriptors
588588
* @ioat_chan: channel (ring) to clean
589589
* @phys_complete: zeroed (or not) completion address (from status)
590590
*/
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)
592592
{
593593
struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma;
594594
struct ioat_ring_ent *desc;
@@ -675,7 +675,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan)
675675
spin_lock_bh(&ioat_chan->cleanup_lock);
676676

677677
if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
678-
__cleanup(ioat_chan, phys_complete);
678+
__ioat_cleanup(ioat_chan, phys_complete);
679679

680680
if (is_ioat_halted(*ioat_chan->completion)) {
681681
u32 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
@@ -712,7 +712,7 @@ static void ioat_restart_channel(struct ioatdma_chan *ioat_chan)
712712

713713
ioat_quiesce(ioat_chan, 0);
714714
if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
715-
__cleanup(ioat_chan, phys_complete);
715+
__ioat_cleanup(ioat_chan, phys_complete);
716716

717717
__ioat_restart_chan(ioat_chan);
718718
}
@@ -786,7 +786,7 @@ static void ioat_eh(struct ioatdma_chan *ioat_chan)
786786

787787
/* cleanup so tail points to descriptor that caused the error */
788788
if (ioat_cleanup_preamble(ioat_chan, &phys_complete))
789-
__cleanup(ioat_chan, phys_complete);
789+
__ioat_cleanup(ioat_chan, phys_complete);
790790

791791
chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET);
792792
pci_read_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, &chanerr_int);
@@ -943,7 +943,7 @@ void ioat_timer_event(struct timer_list *t)
943943
/* timer restarted in ioat_cleanup_preamble
944944
* and IOAT_COMPLETION_ACK cleared
945945
*/
946-
__cleanup(ioat_chan, phys_complete);
946+
__ioat_cleanup(ioat_chan, phys_complete);
947947
goto unlock_out;
948948
}
949949

0 commit comments

Comments
 (0)