diff options
| -rw-r--r-- | drivers/dma/ioat/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 21a5708985bc..0fec3c554fe3 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c | |||
| @@ -129,7 +129,7 @@ static void | |||
| 129 | ioat_init_channel(struct ioatdma_device *ioat_dma, | 129 | ioat_init_channel(struct ioatdma_device *ioat_dma, |
| 130 | struct ioatdma_chan *ioat_chan, int idx); | 130 | struct ioatdma_chan *ioat_chan, int idx); |
| 131 | static void ioat_intr_quirk(struct ioatdma_device *ioat_dma); | 131 | static void ioat_intr_quirk(struct ioatdma_device *ioat_dma); |
| 132 | static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma); | 132 | static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma); |
| 133 | static int ioat3_dma_self_test(struct ioatdma_device *ioat_dma); | 133 | static int ioat3_dma_self_test(struct ioatdma_device *ioat_dma); |
| 134 | 134 | ||
| 135 | static int ioat_dca_enabled = 1; | 135 | static int ioat_dca_enabled = 1; |
| @@ -575,7 +575,7 @@ static void ioat_dma_remove(struct ioatdma_device *ioat_dma) | |||
| 575 | * ioat_enumerate_channels - find and initialize the device's channels | 575 | * ioat_enumerate_channels - find and initialize the device's channels |
| 576 | * @ioat_dma: the ioat dma device to be enumerated | 576 | * @ioat_dma: the ioat dma device to be enumerated |
| 577 | */ | 577 | */ |
| 578 | static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) | 578 | static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma) |
| 579 | { | 579 | { |
| 580 | struct ioatdma_chan *ioat_chan; | 580 | struct ioatdma_chan *ioat_chan; |
| 581 | struct device *dev = &ioat_dma->pdev->dev; | 581 | struct device *dev = &ioat_dma->pdev->dev; |
| @@ -594,7 +594,7 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) | |||
| 594 | xfercap_log = readb(ioat_dma->reg_base + IOAT_XFERCAP_OFFSET); | 594 | xfercap_log = readb(ioat_dma->reg_base + IOAT_XFERCAP_OFFSET); |
| 595 | xfercap_log &= 0x1f; /* bits [4:0] valid */ | 595 | xfercap_log &= 0x1f; /* bits [4:0] valid */ |
| 596 | if (xfercap_log == 0) | 596 | if (xfercap_log == 0) |
| 597 | return 0; | 597 | return; |
| 598 | dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log); | 598 | dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log); |
| 599 | 599 | ||
| 600 | for (i = 0; i < dma->chancnt; i++) { | 600 | for (i = 0; i < dma->chancnt; i++) { |
| @@ -611,7 +611,6 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma) | |||
| 611 | } | 611 | } |
| 612 | } | 612 | } |
| 613 | dma->chancnt = i; | 613 | dma->chancnt = i; |
| 614 | return i; | ||
| 615 | } | 614 | } |
| 616 | 615 | ||
| 617 | /** | 616 | /** |
