summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCong Ding <dinggnu@gmail.com>2013-01-15 01:19:48 +0100
committerVinod Koul <vinod.koul@intel.com>2013-01-20 14:49:40 +0100
commited30933e6f3dbeaaab1de91e1bec25f42d5d32df (patch)
treef4953c62c1a7a5dfa0cf21ecce89d35d0a55906c /drivers
parentdma: edma: fix slave config dependency on direction (diff)
downloadlinux-ed30933e6f3dbeaaab1de91e1bec25f42d5d32df.tar.xz
linux-ed30933e6f3dbeaaab1de91e1bec25f42d5d32df.zip
dma: remove unnecessary null pointer check in mmp_pdma.c
the pointer cfg is dereferenced in line 594, so it's no reason to check null again in line 620. Signed-off-by: Cong Ding <dinggnu@gmail.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/mmp_pdma.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index 13bdf4a7e1ec..41ad6a62f838 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -617,10 +617,8 @@ static int mmp_pdma_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd,
else if (maxburst == 32)
chan->dcmd |= DCMD_BURST32;
- if (cfg) {
- chan->dir = cfg->direction;
- chan->drcmr = cfg->slave_id;
- }
+ chan->dir = cfg->direction;
+ chan->drcmr = cfg->slave_id;
chan->dev_addr = addr;
break;
default: