diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:37:18 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 10:37:18 +0530 |
| commit | 40b4ed1a1a214d9da3db0298b2079103a9a7e32a (patch) | |
| tree | 1cae6c386a574a8f7852e0d3d7bb9f1020e382a1 /drivers/dma/ioat/dma.h | |
| parent | 8e6c1db351168393d8d4bfbcb1782cbf42d9ff74 (diff) | |
| parent | bcdc4bd356c76a5bab2f480a73f089dc8e0e4e89 (diff) | |
| download | lwn-40b4ed1a1a214d9da3db0298b2079103a9a7e32a.tar.gz lwn-40b4ed1a1a214d9da3db0298b2079103a9a7e32a.zip | |
Merge branch 'topic/timer_api' into for-linus
Diffstat (limited to 'drivers/dma/ioat/dma.h')
| -rw-r--r-- | drivers/dma/ioat/dma.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h index 56200eefcf5e..1ab42ec2b7ff 100644 --- a/drivers/dma/ioat/dma.h +++ b/drivers/dma/ioat/dma.h @@ -406,10 +406,9 @@ 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_timer_event(unsigned long data); +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); -void ioat_timer_event(unsigned long data); /* IOAT Init functions */ bool is_bwd_ioat(struct pci_dev *pdev); |