redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: mt7621-dma: Fixing parenthesis alignment 

Fixes checkpatch check: PARENTHESIS_ALIGNMENT

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Christian Lütke-Stetzkamp 2018-03-21 23:25:38 +01:00 committed by Greg Kroah-Hartman
parent 5e62653b6f
commit 4554af3492
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/mt7621-dma/mtk-hsdma.c
View File

@ -191,13 +191,13 @@ static inline u32 mtk_hsdma_read(struct mtk_hsdam_engine *hsdma, u32 reg)
} }
static inline void mtk_hsdma_write(struct mtk_hsdam_engine *hsdma, static inline void mtk_hsdma_write(struct mtk_hsdam_engine *hsdma,
unsigned reg, u32 val) unsigned reg, u32 val)
{ {
writel(val, hsdma->base + reg); writel(val, hsdma->base + reg);
} }
static void mtk_hsdma_reset_chan(struct mtk_hsdam_engine *hsdma, static void mtk_hsdma_reset_chan(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
chan->tx_idx = 0; chan->tx_idx = 0;
chan->rx_idx = HSDMA_DESCS_NUM - 1; chan->rx_idx = HSDMA_DESCS_NUM - 1;
@ -235,7 +235,7 @@ static void hsdma_dump_reg(struct mtk_hsdam_engine *hsdma)
} }
static void hsdma_dump_desc(struct mtk_hsdam_engine *hsdma, static void hsdma_dump_desc(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
struct hsdma_desc *tx_desc; struct hsdma_desc *tx_desc;
struct hsdma_desc *rx_desc; struct hsdma_desc *rx_desc;
@ -256,7 +256,7 @@ static void hsdma_dump_desc(struct mtk_hsdam_engine *hsdma,
} }
static void mtk_hsdma_reset(struct mtk_hsdam_engine *hsdma, static void mtk_hsdma_reset(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
int i; int i;
@ -319,7 +319,7 @@ static int mtk_hsdma_terminate_all(struct dma_chan *c)
} }
static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma, static int mtk_hsdma_start_transfer(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
dma_addr_t src, dst; dma_addr_t src, dst;
size_t len, tlen; size_t len, tlen;
@ -404,7 +404,7 @@ static int gdma_next_desc(struct mtk_hsdma_chan *chan)
} }
static void mtk_hsdma_chan_done(struct mtk_hsdam_engine *hsdma, static void mtk_hsdma_chan_done(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
struct mtk_hsdma_desc *desc; struct mtk_hsdma_desc *desc;
int chan_issued; int chan_issued;
@ -439,7 +439,7 @@ static irqreturn_t mtk_hsdma_irq(int irq, void *devid)
tasklet_schedule(&hsdma->task); tasklet_schedule(&hsdma->task);
else else
dev_dbg(hsdma->ddev.dev, "unhandle irq status %08x\n", dev_dbg(hsdma->ddev.dev, "unhandle irq status %08x\n",
status); status);
/* clean intr bits */ /* clean intr bits */
mtk_hsdma_write(hsdma, HSDMA_REG_INT_STATUS, status); mtk_hsdma_write(hsdma, HSDMA_REG_INT_STATUS, status);
@ -486,7 +486,8 @@ static struct dma_async_tx_descriptor *mtk_hsdma_prep_dma_memcpy(
} }
static enum dma_status mtk_hsdma_tx_status(struct dma_chan *c, static enum dma_status mtk_hsdma_tx_status(struct dma_chan *c,
dma_cookie_t cookie, struct dma_tx_state *state) dma_cookie_t cookie,
struct dma_tx_state *state)
{ {
return dma_cookie_status(c, cookie, state); return dma_cookie_status(c, cookie, state);
} }
@ -546,7 +547,7 @@ static void mtk_hsdma_tasklet(unsigned long arg)
} }
static int mtk_hsdam_alloc_desc(struct mtk_hsdam_engine *hsdma, static int mtk_hsdam_alloc_desc(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
int i; int i;
@ -568,7 +569,7 @@ no_mem:
} }
static void mtk_hsdam_free_desc(struct mtk_hsdam_engine *hsdma, static void mtk_hsdam_free_desc(struct mtk_hsdam_engine *hsdma,
struct mtk_hsdma_chan *chan) struct mtk_hsdma_chan *chan)
{ {
if (chan->tx_ring) { if (chan->tx_ring) {
dma_free_coherent(hsdma->ddev.dev, dma_free_coherent(hsdma->ddev.dev,
@ -610,8 +611,8 @@ static int mtk_hsdma_init(struct mtk_hsdam_engine *hsdma)
/* hardware info */ /* hardware info */
reg = mtk_hsdma_read(hsdma, HSDMA_REG_INFO); reg = mtk_hsdma_read(hsdma, HSDMA_REG_INFO);
dev_info(hsdma->ddev.dev, "rx: %d, tx: %d\n", dev_info(hsdma->ddev.dev, "rx: %d, tx: %d\n",
(reg >> HSDMA_INFO_RX_SHIFT) & HSDMA_INFO_RX_MASK, (reg >> HSDMA_INFO_RX_SHIFT) & HSDMA_INFO_RX_MASK,
(reg >> HSDMA_INFO_TX_SHIFT) & HSDMA_INFO_TX_MASK); (reg >> HSDMA_INFO_TX_SHIFT) & HSDMA_INFO_TX_MASK);
hsdma_dump_reg(hsdma); hsdma_dump_reg(hsdma);
@ -685,7 +686,7 @@ static int mtk_hsdma_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
ret = devm_request_irq(&pdev->dev, irq, mtk_hsdma_irq, ret = devm_request_irq(&pdev->dev, irq, mtk_hsdma_irq,
0, dev_name(&pdev->dev), hsdma); 0, dev_name(&pdev->dev), hsdma);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request irq\n"); dev_err(&pdev->dev, "failed to request irq\n");
return ret; return ret;
@ -725,7 +726,7 @@ static int mtk_hsdma_probe(struct platform_device *pdev)
} }
ret = of_dma_controller_register(pdev->dev.of_node, ret = of_dma_controller_register(pdev->dev.of_node,
of_dma_xlate_by_chan_id, hsdma); of_dma_xlate_by_chan_id, hsdma);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register of dma controller\n"); dev_err(&pdev->dev, "failed to register of dma controller\n");
goto err_unregister; goto err_unregister;

55
drivers/staging/mt7621-dma/ralink-gdma.c
View File

@ -159,13 +159,13 @@ static struct gdma_dma_desc *to_gdma_dma_desc(struct virt_dma_desc *vdesc)
} }
static inline uint32_t gdma_dma_read(struct gdma_dma_dev *dma_dev, static inline uint32_t gdma_dma_read(struct gdma_dma_dev *dma_dev,
unsigned int reg) unsigned int reg)
{ {
return readl(dma_dev->base + reg); return readl(dma_dev->base + reg);
} }
static inline void gdma_dma_write(struct gdma_dma_dev *dma_dev, static inline void gdma_dma_write(struct gdma_dma_dev *dma_dev,
unsigned reg, uint32_t val) unsigned reg, uint32_t val)
{ {
writel(val, dma_dev->base + reg); writel(val, dma_dev->base + reg);
} }
@ -191,7 +191,7 @@ static enum gdma_dma_transfer_size gdma_dma_maxburst(u32 maxburst)
} }
static int gdma_dma_config(struct dma_chan *c, static int gdma_dma_config(struct dma_chan *c,
struct dma_slave_config *config) struct dma_slave_config *config)
{ {
struct gdma_dmaengine_chan *chan = to_gdma_dma_chan(c); struct gdma_dmaengine_chan *chan = to_gdma_dma_chan(c);
struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan); struct gdma_dma_dev *dma_dev = gdma_dma_chan_get_dev(chan);
@ -222,7 +222,7 @@ static int gdma_dma_config(struct dma_chan *c,
break; break;
default: default:
dev_err(dma_dev->ddev.dev, "direction type %d error\n", dev_err(dma_dev->ddev.dev, "direction type %d error\n",
config->direction); config->direction);
return -EINVAL; return -EINVAL;
} }
@ -251,7 +251,7 @@ static int gdma_dma_terminate_all(struct dma_chan *c)
GDMA_REG_CTRL0_ENABLE) { GDMA_REG_CTRL0_ENABLE) {
if (time_after_eq(jiffies, timeout)) { if (time_after_eq(jiffies, timeout)) {
dev_err(dma_dev->ddev.dev, "chan %d wait timeout\n", dev_err(dma_dev->ddev.dev, "chan %d wait timeout\n",
chan->id); chan->id);
/* restore to init value */ /* restore to init value */
gdma_dma_write(dma_dev, GDMA_REG_CTRL0(chan->id), 0); gdma_dma_write(dma_dev, GDMA_REG_CTRL0(chan->id), 0);
break; break;
@ -262,7 +262,7 @@ static int gdma_dma_terminate_all(struct dma_chan *c)
if (i) if (i)
dev_dbg(dma_dev->ddev.dev, "terminate chan %d loops %d\n", dev_dbg(dma_dev->ddev.dev, "terminate chan %d loops %d\n",
chan->id, i); chan->id, i);
return 0; return 0;
} }
@ -290,7 +290,7 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id)); ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id));
if (unlikely(ctrl0 & GDMA_REG_CTRL0_ENABLE)) { if (unlikely(ctrl0 & GDMA_REG_CTRL0_ENABLE)) {
dev_err(dma_dev->ddev.dev, "chan %d is start(%08x).\n", dev_err(dma_dev->ddev.dev, "chan %d is start(%08x).\n",
chan->id, ctrl0); chan->id, ctrl0);
rt305x_dump_reg(dma_dev, chan->id); rt305x_dump_reg(dma_dev, chan->id);
return -EINVAL; return -EINVAL;
} }
@ -320,7 +320,7 @@ static int rt305x_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
(8 << GDMA_REG_CTRL1_DST_REQ_SHIFT); (8 << GDMA_REG_CTRL1_DST_REQ_SHIFT);
} else { } else {
dev_err(dma_dev->ddev.dev, "direction type %d error\n", dev_err(dma_dev->ddev.dev, "direction type %d error\n",
chan->desc->direction); chan->desc->direction);
return -EINVAL; return -EINVAL;
} }
@ -368,7 +368,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id)); ctrl0 = gdma_dma_read(dma_dev, GDMA_REG_CTRL0(chan->id));
if (unlikely(ctrl0 & GDMA_REG_CTRL0_ENABLE)) { if (unlikely(ctrl0 & GDMA_REG_CTRL0_ENABLE)) {
dev_err(dma_dev->ddev.dev, "chan %d is start(%08x).\n", dev_err(dma_dev->ddev.dev, "chan %d is start(%08x).\n",
chan->id, ctrl0); chan->id, ctrl0);
rt3883_dump_reg(dma_dev, chan->id); rt3883_dump_reg(dma_dev, chan->id);
return -EINVAL; return -EINVAL;
} }
@ -396,7 +396,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
GDMA_REG_CTRL1_COHERENT; GDMA_REG_CTRL1_COHERENT;
} else { } else {
dev_err(dma_dev->ddev.dev, "direction type %d error\n", dev_err(dma_dev->ddev.dev, "direction type %d error\n",
chan->desc->direction); chan->desc->direction);
return -EINVAL; return -EINVAL;
} }
@ -418,7 +418,7 @@ static int rt3883_gdma_start_transfer(struct gdma_dmaengine_chan *chan)
} }
static inline int gdma_start_transfer(struct gdma_dma_dev *dma_dev, static inline int gdma_start_transfer(struct gdma_dma_dev *dma_dev,
struct gdma_dmaengine_chan *chan) struct gdma_dmaengine_chan *chan)
{ {
return dma_dev->data->start_transfer(chan); return dma_dev->data->start_transfer(chan);
} }
@ -439,7 +439,7 @@ static int gdma_next_desc(struct gdma_dmaengine_chan *chan)
} }
static void gdma_dma_chan_irq(struct gdma_dma_dev *dma_dev, static void gdma_dma_chan_irq(struct gdma_dma_dev *dma_dev,
struct gdma_dmaengine_chan *chan) struct gdma_dmaengine_chan *chan)
{ {
struct gdma_dma_desc *desc; struct gdma_dma_desc *desc;
unsigned long flags; unsigned long flags;
@ -465,7 +465,7 @@ static void gdma_dma_chan_irq(struct gdma_dma_dev *dma_dev,
} }
} else } else
dev_dbg(dma_dev->ddev.dev, "chan %d no desc to complete\n", dev_dbg(dma_dev->ddev.dev, "chan %d no desc to complete\n",
chan->id); chan->id);
if (chan_issued) if (chan_issued)
set_bit(chan->id, &dma_dev->chan_issued); set_bit(chan->id, &dma_dev->chan_issued);
spin_unlock_irqrestore(&chan->vchan.lock, flags); spin_unlock_irqrestore(&chan->vchan.lock, flags);
@ -515,7 +515,7 @@ static void gdma_dma_issue_pending(struct dma_chan *c)
tasklet_schedule(&dma_dev->task); tasklet_schedule(&dma_dev->task);
} else } else
dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n", dev_dbg(dma_dev->ddev.dev, "chan %d no desc to issue\n",
chan->id); chan->id);
} }
spin_unlock_irqrestore(&chan->vchan.lock, flags); spin_unlock_irqrestore(&chan->vchan.lock, flags);
} }
@ -544,13 +544,13 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_slave_sg(
desc->sg[i].dst_addr = sg_dma_address(sg); desc->sg[i].dst_addr = sg_dma_address(sg);
else { else {
dev_err(c->device->dev, "direction type %d error\n", dev_err(c->device->dev, "direction type %d error\n",
direction); direction);
goto free_desc; goto free_desc;
} }
if (unlikely(sg_dma_len(sg) > GDMA_REG_CTRL0_TX_MASK)) { if (unlikely(sg_dma_len(sg) > GDMA_REG_CTRL0_TX_MASK)) {
dev_err(c->device->dev, "sg len too large %d\n", dev_err(c->device->dev, "sg len too large %d\n",
sg_dma_len(sg)); sg_dma_len(sg));
goto free_desc; goto free_desc;
} }
desc->sg[i].len = sg_dma_len(sg); desc->sg[i].len = sg_dma_len(sg);
@ -625,7 +625,7 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_dma_cyclic(
if (period_len > GDMA_REG_CTRL0_TX_MASK) { if (period_len > GDMA_REG_CTRL0_TX_MASK) {
dev_err(c->device->dev, "cyclic len too large %d\n", dev_err(c->device->dev, "cyclic len too large %d\n",
period_len); period_len);
return NULL; return NULL;
} }
@ -644,7 +644,7 @@ static struct dma_async_tx_descriptor *gdma_dma_prep_dma_cyclic(
desc->sg[i].dst_addr = buf_addr; desc->sg[i].dst_addr = buf_addr;
else { else {
dev_err(c->device->dev, "direction type %d error\n", dev_err(c->device->dev, "direction type %d error\n",
direction); direction);
goto free_desc; goto free_desc;
} }
desc->sg[i].len = period_len; desc->sg[i].len = period_len;
@ -663,7 +663,8 @@ free_desc:
} }
static enum dma_status gdma_dma_tx_status(struct dma_chan *c, static enum dma_status gdma_dma_tx_status(struct dma_chan *c,
dma_cookie_t cookie, struct dma_tx_state *state) dma_cookie_t cookie,
struct dma_tx_state *state)
{ {
struct gdma_dmaengine_chan *chan = to_gdma_dma_chan(c); struct gdma_dmaengine_chan *chan = to_gdma_dma_chan(c);
struct virt_dma_desc *vdesc; struct virt_dma_desc *vdesc;
@ -757,9 +758,9 @@ static void rt305x_gdma_init(struct gdma_dma_dev *dma_dev)
gct = gdma_dma_read(dma_dev, GDMA_RT305X_GCT); gct = gdma_dma_read(dma_dev, GDMA_RT305X_GCT);
dev_info(dma_dev->ddev.dev, "revision: %d, channels: %d\n", dev_info(dma_dev->ddev.dev, "revision: %d, channels: %d\n",
(gct >> GDMA_REG_GCT_VER_SHIFT) & GDMA_REG_GCT_VER_MASK, (gct >> GDMA_REG_GCT_VER_SHIFT) & GDMA_REG_GCT_VER_MASK,
8 << ((gct >> GDMA_REG_GCT_CHAN_SHIFT) & 8 << ((gct >> GDMA_REG_GCT_CHAN_SHIFT) &
GDMA_REG_GCT_CHAN_MASK)); GDMA_REG_GCT_CHAN_MASK));
} }
static void rt3883_gdma_init(struct gdma_dma_dev *dma_dev) static void rt3883_gdma_init(struct gdma_dma_dev *dma_dev)
@ -771,9 +772,9 @@ static void rt3883_gdma_init(struct gdma_dma_dev *dma_dev)
gct = gdma_dma_read(dma_dev, GDMA_REG_GCT); gct = gdma_dma_read(dma_dev, GDMA_REG_GCT);
dev_info(dma_dev->ddev.dev, "revision: %d, channels: %d\n", dev_info(dma_dev->ddev.dev, "revision: %d, channels: %d\n",
(gct >> GDMA_REG_GCT_VER_SHIFT) & GDMA_REG_GCT_VER_MASK, (gct >> GDMA_REG_GCT_VER_SHIFT) & GDMA_REG_GCT_VER_MASK,
8 << ((gct >> GDMA_REG_GCT_CHAN_SHIFT) & 8 << ((gct >> GDMA_REG_GCT_CHAN_SHIFT) &
GDMA_REG_GCT_CHAN_MASK)); GDMA_REG_GCT_CHAN_MASK));
} }
static struct gdma_data rt305x_gdma_data = { static struct gdma_data rt305x_gdma_data = {
@ -840,7 +841,7 @@ static int gdma_dma_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
ret = devm_request_irq(&pdev->dev, irq, gdma_dma_irq, ret = devm_request_irq(&pdev->dev, irq, gdma_dma_irq,
0, dev_name(&pdev->dev), dma_dev); 0, dev_name(&pdev->dev), dma_dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request irq\n"); dev_err(&pdev->dev, "failed to request irq\n");
return ret; return ret;
@ -888,7 +889,7 @@ static int gdma_dma_probe(struct platform_device *pdev)
} }
ret = of_dma_controller_register(pdev->dev.of_node, ret = of_dma_controller_register(pdev->dev.of_node,
of_dma_xlate_by_chan_id, dma_dev); of_dma_xlate_by_chan_id, dma_dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register of dma controller\n"); dev_err(&pdev->dev, "failed to register of dma controller\n");
goto err_unregister; goto err_unregister;