Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / drivers / dma / ioat / dma.h

diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 1bc084986646d415385d0ca3358b2d2966a3a666..8f4e607d5817be1a84ca50f3cc50564e237ecc36 100644 (file)
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -82,8 +82,9 @@ struct ioatdma_device {
        struct dma_pool *sed_hw_pool[MAX_SED_POOLS];
        struct dma_device dma_dev;
        u8 version;
-       struct msix_entry msix_entries[4];
-       struct ioatdma_chan *idx[4];
+#define IOAT_MAX_CHANS 4
+       struct msix_entry msix_entries[IOAT_MAX_CHANS];
+       struct ioatdma_chan *idx[IOAT_MAX_CHANS];
        struct dca_provider *dca;
        enum ioat_irq_mode irq_mode;
        u32 cap;
@@ -95,6 +96,7 @@ struct ioatdma_chan {
        dma_addr_t last_completion;
        spinlock_t cleanup_lock;
        unsigned long state;
+       #define IOAT_CHAN_DOWN 0
        #define IOAT_COMPLETION_ACK 1
        #define IOAT_RESET_PENDING 2
        #define IOAT_KOBJ_INIT_FAIL 3