diff options
Diffstat (limited to 'drivers/dma/ioat/dma.c')
-rw-r--r-- | drivers/dma/ioat/dma.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index a4d6cb0c0343..659518015972 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
@@ -548,9 +548,9 @@ void ioat_dma_unmap(struct ioat_chan_common *chan, enum dma_ctrl_flags flags, | |||
548 | PCI_DMA_TODEVICE, flags, 0); | 548 | PCI_DMA_TODEVICE, flags, 0); |
549 | } | 549 | } |
550 | 550 | ||
551 | unsigned long ioat_get_current_completion(struct ioat_chan_common *chan) | 551 | dma_addr_t ioat_get_current_completion(struct ioat_chan_common *chan) |
552 | { | 552 | { |
553 | unsigned long phys_complete; | 553 | dma_addr_t phys_complete; |
554 | u64 completion; | 554 | u64 completion; |
555 | 555 | ||
556 | completion = *chan->completion; | 556 | completion = *chan->completion; |
@@ -571,7 +571,7 @@ unsigned long ioat_get_current_completion(struct ioat_chan_common *chan) | |||
571 | } | 571 | } |
572 | 572 | ||
573 | bool ioat_cleanup_preamble(struct ioat_chan_common *chan, | 573 | bool ioat_cleanup_preamble(struct ioat_chan_common *chan, |
574 | unsigned long *phys_complete) | 574 | dma_addr_t *phys_complete) |
575 | { | 575 | { |
576 | *phys_complete = ioat_get_current_completion(chan); | 576 | *phys_complete = ioat_get_current_completion(chan); |
577 | if (*phys_complete == chan->last_completion) | 577 | if (*phys_complete == chan->last_completion) |
@@ -582,14 +582,14 @@ bool ioat_cleanup_preamble(struct ioat_chan_common *chan, | |||
582 | return true; | 582 | return true; |
583 | } | 583 | } |
584 | 584 | ||
585 | static void __cleanup(struct ioat_dma_chan *ioat, unsigned long phys_complete) | 585 | static void __cleanup(struct ioat_dma_chan *ioat, dma_addr_t phys_complete) |
586 | { | 586 | { |
587 | struct ioat_chan_common *chan = &ioat->base; | 587 | struct ioat_chan_common *chan = &ioat->base; |
588 | struct list_head *_desc, *n; | 588 | struct list_head *_desc, *n; |
589 | struct dma_async_tx_descriptor *tx; | 589 | struct dma_async_tx_descriptor *tx; |
590 | 590 | ||
591 | dev_dbg(to_dev(chan), "%s: phys_complete: %lx\n", | 591 | dev_dbg(to_dev(chan), "%s: phys_complete: %llx\n", |
592 | __func__, phys_complete); | 592 | __func__, (unsigned long long) phys_complete); |
593 | list_for_each_safe(_desc, n, &ioat->used_desc) { | 593 | list_for_each_safe(_desc, n, &ioat->used_desc) { |
594 | struct ioat_desc_sw *desc; | 594 | struct ioat_desc_sw *desc; |
595 | 595 | ||
@@ -655,7 +655,7 @@ static void __cleanup(struct ioat_dma_chan *ioat, unsigned long phys_complete) | |||
655 | static void ioat1_cleanup(struct ioat_dma_chan *ioat) | 655 | static void ioat1_cleanup(struct ioat_dma_chan *ioat) |
656 | { | 656 | { |
657 | struct ioat_chan_common *chan = &ioat->base; | 657 | struct ioat_chan_common *chan = &ioat->base; |
658 | unsigned long phys_complete; | 658 | dma_addr_t phys_complete; |
659 | 659 | ||
660 | prefetch(chan->completion); | 660 | prefetch(chan->completion); |
661 | 661 | ||
@@ -701,7 +701,7 @@ static void ioat1_timer_event(unsigned long data) | |||
701 | mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT); | 701 | mod_timer(&chan->timer, jiffies + COMPLETION_TIMEOUT); |
702 | spin_unlock_bh(&ioat->desc_lock); | 702 | spin_unlock_bh(&ioat->desc_lock); |
703 | } else if (test_bit(IOAT_COMPLETION_PENDING, &chan->state)) { | 703 | } else if (test_bit(IOAT_COMPLETION_PENDING, &chan->state)) { |
704 | unsigned long phys_complete; | 704 | dma_addr_t phys_complete; |
705 | 705 | ||
706 | spin_lock_bh(&ioat->desc_lock); | 706 | spin_lock_bh(&ioat->desc_lock); |
707 | /* if we haven't made progress and we have already | 707 | /* if we haven't made progress and we have already |