| Message ID | 20230612093537.467120754@infradead.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f62141ac730d6fe73a05750cb4482aabb681cfb9 |
| Headers | show |
| Series | Scope-based Resource Management | expand |
On 6/12/23 02:07, Peter Zijlstra wrote: > 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> > --- > drivers/dma/ioat/dma.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > --- a/drivers/dma/ioat/dma.c > +++ b/drivers/dma/ioat/dma.c > @@ -584,11 +584,11 @@ desc_get_errstat(struct ioatdma_chan *io > } > > /** > - * __cleanup - reclaim used descriptors > + * __ioat_cleanup - reclaim used descriptors > * @ioat_chan: channel (ring) to clean > * @phys_complete: zeroed (or not) completion address (from status) > */ > -static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) > +static void __ioat_cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) > { > struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma; > struct ioat_ring_ent *desc; > @@ -675,7 +675,7 @@ static void ioat_cleanup(struct ioatdma_ > spin_lock_bh(&ioat_chan->cleanup_lock); > > if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) > - __cleanup(ioat_chan, phys_complete); > + __ioat_cleanup(ioat_chan, phys_complete); > > if (is_ioat_halted(*ioat_chan->completion)) { > u32 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); > @@ -712,7 +712,7 @@ static void ioat_restart_channel(struct > > ioat_quiesce(ioat_chan, 0); > if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) > - __cleanup(ioat_chan, phys_complete); > + __ioat_cleanup(ioat_chan, phys_complete); > > __ioat_restart_chan(ioat_chan); > } > @@ -786,7 +786,7 @@ static void ioat_eh(struct ioatdma_chan > > /* cleanup so tail points to descriptor that caused the error */ > if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) > - __cleanup(ioat_chan, phys_complete); > + __ioat_cleanup(ioat_chan, phys_complete); > > chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); > pci_read_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, &chanerr_int); > @@ -943,7 +943,7 @@ void ioat_timer_event(struct timer_list > /* timer restarted in ioat_cleanup_preamble > * and IOAT_COMPLETION_ACK cleared > */ > - __cleanup(ioat_chan, phys_complete); > + __ioat_cleanup(ioat_chan, phys_complete); > goto unlock_out; > } > > >
--- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -584,11 +584,11 @@ desc_get_errstat(struct ioatdma_chan *io } /** - * __cleanup - reclaim used descriptors + * __ioat_cleanup - reclaim used descriptors * @ioat_chan: channel (ring) to clean * @phys_complete: zeroed (or not) completion address (from status) */ -static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) +static void __ioat_cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) { struct ioatdma_device *ioat_dma = ioat_chan->ioat_dma; struct ioat_ring_ent *desc; @@ -675,7 +675,7 @@ static void ioat_cleanup(struct ioatdma_ spin_lock_bh(&ioat_chan->cleanup_lock); if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) - __cleanup(ioat_chan, phys_complete); + __ioat_cleanup(ioat_chan, phys_complete); if (is_ioat_halted(*ioat_chan->completion)) { u32 chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); @@ -712,7 +712,7 @@ static void ioat_restart_channel(struct ioat_quiesce(ioat_chan, 0); if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) - __cleanup(ioat_chan, phys_complete); + __ioat_cleanup(ioat_chan, phys_complete); __ioat_restart_chan(ioat_chan); } @@ -786,7 +786,7 @@ static void ioat_eh(struct ioatdma_chan /* cleanup so tail points to descriptor that caused the error */ if (ioat_cleanup_preamble(ioat_chan, &phys_complete)) - __cleanup(ioat_chan, phys_complete); + __ioat_cleanup(ioat_chan, phys_complete); chanerr = readl(ioat_chan->reg_base + IOAT_CHANERR_OFFSET); pci_read_config_dword(pdev, IOAT_PCI_CHANERR_INT_OFFSET, &chanerr_int); @@ -943,7 +943,7 @@ void ioat_timer_event(struct timer_list /* timer restarted in ioat_cleanup_preamble * and IOAT_COMPLETION_ACK cleared */ - __cleanup(ioat_chan, phys_complete); + __ioat_cleanup(ioat_chan, phys_complete); goto unlock_out; }
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> --- drivers/dma/ioat/dma.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)