diff options
| author |   Koul, Vinod <vinod.koul@intel.com> | 2010-10-04 10:38:43 +0000 |
|---|---|---|
| committer |   Dan Williams <dan.j.williams@intel.com> | 2010-10-07 15:03:44 -0700 |
| commit | 20dd63900d238e17b122fe0c7376ff090867f528 (patch) | |
| tree | 8f25adbbb5d49ca428df2596d1e2e24e8e40e428 /drivers/dma/intel_mid_dma_regs.h | |
| parent | intel_mid_dma: fix the WARN_ONs (diff) | |
| download | linux-dev-20dd63900d238e17b122fe0c7376ff090867f528.tar.xz linux-dev-20dd63900d238e17b122fe0c7376ff090867f528.zip | |
intel_mid_dma: change the slave interface
In 2.6.36 kernel, dma slave control command was introduced,
this patch changes the intel-mid-dma driver to this
new kernel slave interface
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/intel_mid_dma_regs.h')
| -rw-r--r-- | drivers/dma/intel_mid_dma_regs.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/dma/intel_mid_dma_regs.h b/drivers/dma/intel_mid_dma_regs.h index 7a5ac56d1324..709fecbdde79 100644 --- a/drivers/dma/intel_mid_dma_regs.h +++ b/drivers/dma/intel_mid_dma_regs.h @@ -187,13 +187,13 @@ struct intel_mid_dma_chan { struct list_head active_list; struct list_head queue; struct list_head free_list; - struct intel_mid_dma_slave *slave; unsigned int descs_allocated; struct middma_device *dma; bool busy; bool in_use; u32 raw_tfr; u32 raw_block; + struct intel_mid_dma_slave *mid_slave; }; static inline struct intel_mid_dma_chan *to_intel_mid_dma_chan( @@ -264,7 +264,7 @@ struct intel_mid_dma_desc { dma_addr_t next; enum dma_data_direction dirn; enum dma_status status; - enum intel_mid_dma_width width; /*width of DMA txn*/ + enum dma_slave_buswidth width; /*width of DMA txn*/ enum intel_mid_dma_mode cfg_mode; /*mode configuration*/ }; @@ -289,6 +289,13 @@ static inline struct intel_mid_dma_desc *to_intel_mid_dma_desc return container_of(txd, struct intel_mid_dma_desc, txd); } +static inline struct intel_mid_dma_slave *to_intel_mid_dma_slave + (struct dma_slave_config *slave) +{ + return container_of(slave, struct intel_mid_dma_slave, dma_slave); +} + + int dma_resume(struct pci_dev *pci); #endif /*__INTEL_MID_DMAC_REGS_H__*/ |