summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-10-12 13:00:51 +0000
committerDan Williams <dan.j.williams@intel.com>2010-10-19 15:17:07 -0700
commit38bdbf020ad7ae1bca564a7db238cdf8b2f462a8 (patch)
treeee8e859322c752d4db84670fc55c707cdc59ce82 /drivers/dma
parent730c1871680774ea0700debc2981c7a53f51d92e (diff)
downloadop-kernel-dev-38bdbf020ad7ae1bca564a7db238cdf8b2f462a8.zip
op-kernel-dev-38bdbf020ad7ae1bca564a7db238cdf8b2f462a8.tar.gz
ste_dma40: move channel mode to a separate field
And keep it logical by default. Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 7bc535e..ddaeb51 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -1151,8 +1151,7 @@ static int d40_validate_conf(struct d40_chan *d40c,
int res = 0;
u32 dst_event_group = D40_TYPE_TO_GROUP(conf->dst_dev_type);
u32 src_event_group = D40_TYPE_TO_GROUP(conf->src_dev_type);
- bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE)
- == STEDMA40_CHANNEL_IN_LOG_MODE;
+ bool is_log = conf->mode == STEDMA40_MODE_LOGICAL;
if (!conf->dir) {
dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n",
@@ -1316,10 +1315,7 @@ static int d40_allocate_channel(struct d40_chan *d40c)
int j;
int log_num;
bool is_src;
- bool is_log = (d40c->dma_cfg.channel_type &
- STEDMA40_CHANNEL_IN_OPER_MODE)
- == STEDMA40_CHANNEL_IN_LOG_MODE;
-
+ bool is_log = d40c->dma_cfg.mode == STEDMA40_MODE_LOGICAL;
phys = d40c->base->phy_res;
OpenPOWER on IntegriCloud