summaryrefslogtreecommitdiffstats
path: root/drivers/dma/mv_xor.h
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-15 15:29:53 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 15:58:59 +0100
commit297eedbae1677c8276df082fb17fb1344058fed0 (patch)
tree0bb22fd693ff21d0e8c6266e8d6bae7028dae75a /drivers/dma/mv_xor.h
parentdma: mv_xor: merge mv_xor_device and mv_xor_chan (diff)
downloadlinux-297eedbae1677c8276df082fb17fb1344058fed0.tar.xz
linux-297eedbae1677c8276df082fb17fb1344058fed0.zip
dma: mv_xor: rename mv_xor_private to mv_xor_device
Now that mv_xor_device is no longer used to designate the per-channel DMA devices, use it know to designate the XOR engine themselves (currently composed of two XOR channels). So, now we have the nice organization where: - mv_xor_device represents each XOR engine in the system - mv_xor_chan represents each XOR channel of a given XOR engine Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'drivers/dma/mv_xor.h')
-rw-r--r--drivers/dma/mv_xor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/mv_xor.h b/drivers/dma/mv_xor.h
index 16de1f62c950..cedeaa04f238 100644
--- a/drivers/dma/mv_xor.h
+++ b/drivers/dma/mv_xor.h
@@ -53,7 +53,7 @@
#define WINDOW_REMAP_HIGH(w) (0x290 + ((w) << 2))
#define WINDOW_BAR_ENABLE(chan) (0x240 + ((chan) << 2))
-struct mv_xor_private {
+struct mv_xor_device {
void __iomem *xor_base;
void __iomem *xor_high_base;
struct clk *clk;
@@ -87,7 +87,7 @@ struct mv_xor_chan {
void *dma_desc_pool_virt;
size_t pool_size;
struct dma_device dmadev;
- struct mv_xor_private *shared;
+ struct mv_xor_device *shared;
struct dma_chan dmachan;
struct mv_xor_desc_slot *last_used;
struct list_head all_slots;