diff options
Diffstat (limited to 'drivers/dma/ioatdma.c')
-rw-r--r-- | drivers/dma/ioatdma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c index dbd4d6c3698e..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; |
@@ -563,7 +563,7 @@ static struct pci_driver ioat_pci_drv = { | |||
563 | .remove = __devexit_p(ioat_remove), | 563 | .remove = __devexit_p(ioat_remove), |
564 | }; | 564 | }; |
565 | 565 | ||
566 | static irqreturn_t ioat_do_interrupt(int irq, void *data, struct pt_regs *regs) | 566 | static irqreturn_t ioat_do_interrupt(int irq, void *data) |
567 | { | 567 | { |
568 | struct ioat_device *instance = data; | 568 | struct ioat_device *instance = data; |
569 | unsigned long attnstatus; | 569 | unsigned long attnstatus; |
@@ -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); |