system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-22 20:37:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: mt7621-dma: fix unbalanced braces

Browse source 
Add braces to conditional statements if the other branch has them in
order to be more compliant with the linux kernel coding style.

Remaining checkpatch.pl issues include unnecessary line continuations
and use of non-conventional types.

Signed-off-by: Lou Knauer <lou.knauer@fau.de>
Signed-off-by: Philipp Panzer <philipp.panzer@fau.de>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lou Knauer 2018-12-13 10:43:17 +01:00 committed by Greg Kroah-Hartman
parent 3dbf37c03b
commit 4765f68374
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/mt7621-dma/ralink-gdma.c
View file

@ -459,12 +459,14 @@ static void gdma_dma_chan_irq(struct gdma_dma_dev *dma_dev,
list_del(&desc->vdesc.node);
vchan_cookie_complete(&desc->vdesc);
chan_issued = gdma_next_desc(chan);
} else
} else {
chan_issued = 1;
}
}
} else
} else {
dev_dbg(dma_dev->ddev.dev, "chan %d no desc to complete\n",
chan->id);
}
if (chan_issued)
set_bit(chan->id, &dma_dev->chan_issued);
spin_unlock_irqrestore(&chan->vchan.lock, flags);
@ -512,9 +514,10 @@ static void gdma_dma_issue_pending(struct dma_chan *c)
if (gdma_next_desc(chan)) {
set_bit(chan->id, &dma_dev->chan_issued);
tasklet_schedule(&dma_dev->task);
} else
} else {
dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n",
chan->id);
}
}
spin_unlock_irqrestore(&chan->vchan.lock, flags);
}
@ -537,11 +540,11 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_slave_sg(
desc->residue = 0;
for_each_sg(sgl, sg, sg_len, i) {
if (direction == DMA_MEM_TO_DEV)
if (direction == DMA_MEM_TO_DEV) {
desc->sg[i].src_addr = sg_dma_address(sg);
else if (direction == DMA_DEV_TO_MEM)
} else if (direction == DMA_DEV_TO_MEM) {
desc->sg[i].dst_addr = sg_dma_address(sg);
else {
} else {
dev_err(c->device->dev, "direction type %d error\n",
direction);
goto free_desc;
@ -637,11 +640,11 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_dma_cyclic(
desc->residue = buf_len;
for (i = 0; i < num_periods; i++) {
if (direction == DMA_MEM_TO_DEV)
if (direction == DMA_MEM_TO_DEV) {
desc->sg[i].src_addr = buf_addr;
else if (direction == DMA_DEV_TO_MEM)
} else if (direction == DMA_DEV_TO_MEM) {
desc->sg[i].dst_addr = buf_addr;
else {
} else {
dev_err(c->device->dev, "direction type %d error\n",
direction);
goto free_desc;
@ -737,9 +740,9 @@ static void gdma_dma_tasklet(unsigned long arg)
if (chan->desc) {
atomic_inc(&dma_dev->cnt);
gdma_start_transfer(dma_dev, chan);
} else
} else {
dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n", chan->id);
}
if (!dma_dev->chan_issued)
break;
}