diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-10 17:45:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 18:37:21 -0400 |
commit | 47b16539e1072afd2c964b97be4a95b5cf2ff801 (patch) | |
tree | 6acd1d1a667f5b724cdc5c95f0bbed2639a24b55 | |
parent | c714de5dcf41cee869c4a74e8783c6d9be459ef6 (diff) |
[PATCH] drivers/dma trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/dma/ioatdma.c | 4 | ||||
-rw-r--r-- | drivers/dma/ioatdma.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c index f3bf1e230bca..0358419a0e48 100644 --- a/drivers/dma/ioatdma.c +++ b/drivers/dma/ioatdma.c | |||
@@ -80,7 +80,7 @@ static int enumerate_dma_channels(struct ioat_device *device) | |||
80 | 80 | ||
81 | static struct ioat_desc_sw *ioat_dma_alloc_descriptor( | 81 | static struct ioat_desc_sw *ioat_dma_alloc_descriptor( |
82 | struct ioat_dma_chan *ioat_chan, | 82 | struct ioat_dma_chan *ioat_chan, |
83 | int flags) | 83 | gfp_t flags) |
84 | { | 84 | { |
85 | struct ioat_dma_descriptor *desc; | 85 | struct ioat_dma_descriptor *desc; |
86 | struct ioat_desc_sw *desc_sw; | 86 | struct ioat_desc_sw *desc_sw; |
@@ -686,7 +686,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev, | |||
686 | { | 686 | { |
687 | int err; | 687 | int err; |
688 | unsigned long mmio_start, mmio_len; | 688 | unsigned long mmio_start, mmio_len; |
689 | void *reg_base; | 689 | void __iomem *reg_base; |
690 | struct ioat_device *device; | 690 | struct ioat_device *device; |
691 | 691 | ||
692 | err = pci_enable_device(pdev); | 692 | err = pci_enable_device(pdev); |
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h index a5d3b3644160..62b26a9be4c9 100644 --- a/drivers/dma/ioatdma.h +++ b/drivers/dma/ioatdma.h | |||
@@ -44,7 +44,7 @@ extern struct list_head dma_client_list; | |||
44 | 44 | ||
45 | struct ioat_device { | 45 | struct ioat_device { |
46 | struct pci_dev *pdev; | 46 | struct pci_dev *pdev; |
47 | void *reg_base; | 47 | void __iomem *reg_base; |
48 | struct pci_pool *dma_pool; | 48 | struct pci_pool *dma_pool; |
49 | struct pci_pool *completion_pool; | 49 | struct pci_pool *completion_pool; |
50 | 50 | ||
@@ -73,7 +73,7 @@ struct ioat_device { | |||
73 | 73 | ||
74 | struct ioat_dma_chan { | 74 | struct ioat_dma_chan { |
75 | 75 | ||
76 | void *reg_base; | 76 | void __iomem *reg_base; |
77 | 77 | ||
78 | dma_cookie_t completed_cookie; | 78 | dma_cookie_t completed_cookie; |
79 | unsigned long last_completion; | 79 | unsigned long last_completion; |