| Message ID | 20200831103542.305571-10-allen.lkml@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | dmaengine: convert tasklets to use new | expand |
On 8/31/2020 3:35 AM, Allen Pais wrote: > In preparation for unconditionally passing the > struct tasklet_struct pointer to all tasklet > callbacks, switch to using the new tasklet_setup() > and from_tasklet() to pass the tasklet pointer explicitly. > > Signed-off-by: Romain Perier <romain.perier@gmail.com> > Signed-off-by: Allen Pais <allen.lkml@gmail.com> Acked-by: Dave Jiang <dave.jiang@intel.com> > --- > drivers/dma/ioat/dma.c | 6 +++--- > drivers/dma/ioat/dma.h | 2 +- > drivers/dma/ioat/init.c | 4 +--- > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c > index a814b200299b..bfcf67febfe6 100644 > --- a/drivers/dma/ioat/dma.c > +++ b/drivers/dma/ioat/dma.c > @@ -165,7 +165,7 @@ void ioat_stop(struct ioatdma_chan *ioat_chan) > tasklet_kill(&ioat_chan->cleanup_task); > > /* final cleanup now that everything is quiesced and can't re-arm */ > - ioat_cleanup_event((unsigned long)&ioat_chan->dma_chan); > + ioat_cleanup_event(&ioat_chan->cleanup_task); > } > > static void __ioat_issue_pending(struct ioatdma_chan *ioat_chan) > @@ -690,9 +690,9 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan) > spin_unlock_bh(&ioat_chan->cleanup_lock); > } > > -void ioat_cleanup_event(unsigned long data) > +void ioat_cleanup_event(struct tasklet_struct *t) > { > - struct ioatdma_chan *ioat_chan = to_ioat_chan((void *)data); > + struct ioatdma_chan *ioat_chan = from_tasklet(ioat_chan, t, cleanup_task); > > ioat_cleanup(ioat_chan); > if (!test_bit(IOAT_RUN, &ioat_chan->state)) > diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h > index f7f31fdf14cf..140cfe3782fb 100644 > --- a/drivers/dma/ioat/dma.h > +++ b/drivers/dma/ioat/dma.h > @@ -393,7 +393,7 @@ int ioat_reset_hw(struct ioatdma_chan *ioat_chan); > enum dma_status > ioat_tx_status(struct dma_chan *c, dma_cookie_t cookie, > struct dma_tx_state *txstate); > -void ioat_cleanup_event(unsigned long data); > +void ioat_cleanup_event(struct tasklet_struct *t); > void ioat_timer_event(struct timer_list *t); > int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs); > void ioat_issue_pending(struct dma_chan *chan); > diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c > index 8a53f5c96b16..191b59279007 100644 > --- a/drivers/dma/ioat/init.c > +++ b/drivers/dma/ioat/init.c > @@ -767,8 +767,6 @@ ioat_init_channel(struct ioatdma_device *ioat_dma, > struct ioatdma_chan *ioat_chan, int idx) > { > struct dma_device *dma = &ioat_dma->dma_dev; > - struct dma_chan *c = &ioat_chan->dma_chan; > - unsigned long data = (unsigned long) c; > > ioat_chan->ioat_dma = ioat_dma; > ioat_chan->reg_base = ioat_dma->reg_base + (0x80 * (idx + 1)); > @@ -778,7 +776,7 @@ ioat_init_channel(struct ioatdma_device *ioat_dma, > list_add_tail(&ioat_chan->dma_chan.device_node, &dma->channels); > ioat_dma->idx[idx] = ioat_chan; > timer_setup(&ioat_chan->timer, ioat_timer_event, 0); > - tasklet_init(&ioat_chan->cleanup_task, ioat_cleanup_event, data); > + tasklet_setup(&ioat_chan->cleanup_task, ioat_cleanup_event); > } > > #define IOAT_NUM_SRC_TEST 6 /* must be <= 8 */ >
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index a814b200299b..bfcf67febfe6 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -165,7 +165,7 @@ void ioat_stop(struct ioatdma_chan *ioat_chan) tasklet_kill(&ioat_chan->cleanup_task); /* final cleanup now that everything is quiesced and can't re-arm */ - ioat_cleanup_event((unsigned long)&ioat_chan->dma_chan); + ioat_cleanup_event(&ioat_chan->cleanup_task); } static void __ioat_issue_pending(struct ioatdma_chan *ioat_chan) @@ -690,9 +690,9 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan) spin_unlock_bh(&ioat_chan->cleanup_lock); } -void ioat_cleanup_event(unsigned long data) +void ioat_cleanup_event(struct tasklet_struct *t) { - struct ioatdma_chan *ioat_chan = to_ioat_chan((void *)data); + struct ioatdma_chan *ioat_chan = from_tasklet(ioat_chan, t, cleanup_task); ioat_cleanup(ioat_chan); if (!test_bit(IOAT_RUN, &ioat_chan->state)) diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h index f7f31fdf14cf..140cfe3782fb 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h @@ -393,7 +393,7 @@ int ioat_reset_hw(struct ioatdma_chan *ioat_chan); enum dma_status ioat_tx_status(struct dma_chan *c, dma_cookie_t cookie, struct dma_tx_state *txstate); -void ioat_cleanup_event(unsigned long data); +void ioat_cleanup_event(struct tasklet_struct *t); void ioat_timer_event(struct timer_list *t); int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs); void ioat_issue_pending(struct dma_chan *chan); diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 8a53f5c96b16..191b59279007 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -767,8 +767,6 @@ ioat_init_channel(struct ioatdma_device *ioat_dma, struct ioatdma_chan *ioat_chan, int idx) { struct dma_device *dma = &ioat_dma->dma_dev; - struct dma_chan *c = &ioat_chan->dma_chan; - unsigned long data = (unsigned long) c; ioat_chan->ioat_dma = ioat_dma; ioat_chan->reg_base = ioat_dma->reg_base + (0x80 * (idx + 1)); @@ -778,7 +776,7 @@ ioat_init_channel(struct ioatdma_device *ioat_dma, list_add_tail(&ioat_chan->dma_chan.device_node, &dma->channels); ioat_dma->idx[idx] = ioat_chan; timer_setup(&ioat_chan->timer, ioat_timer_event, 0); - tasklet_init(&ioat_chan->cleanup_task, ioat_cleanup_event, data); + tasklet_setup(&ioat_chan->cleanup_task, ioat_cleanup_event); } #define IOAT_NUM_SRC_TEST 6 /* must be <= 8 */