dmaengine: dw-axi-dmac: fix alignment, blank line and non-useful return warning
Subsystems (2)
PATCH v2 1/1 dmaengine: dw-axi-dmac: fix alignment, blank line and non-useful return warning
Fix the scripts/checkpatch.pl warning in drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:345 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:356 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:422 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:494 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:597 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:1167 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:1456 drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c:1650
---
Changes in v2:
- rebase on top of 3c8a86ed002a "dmaengine: xilinx: xdma: use sg_nents_for_dma() helper"
- refactor the commit title
Reference to v1:
https://lore.kernel.org/all/[email protected]/
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +8 -9
@@ -342,8 +342,8 @@ static void axi_desc_put(struct axi_dma_desc *desc)kfree (desc);atomic_sub (descs_put, &chan->descs_allocated);dev_vdbg (chan2dev (chan),"%s: %d descs put, %d still allocated\n" , -axi_chan_name (chan), descs_put, -atomic_read (&chan->descs_allocated)); +axi_chan_name (chan), descs_put, +atomic_read (&chan->descs_allocated)); }static void vchan_desc_put (struct virt_dma_desc *vdesc)
@@ -353,7 +353,7 @@ static void vchan_desc_put(struct virt_dma_desc *vdesc)static enum dma_status dma_chan_tx_status (struct dma_chan *dchan,dma_cookie_t cookie, -struct dma_tx_state *txstate) +struct dma_tx_state *txstate) {struct axi_dma_chan *chan =dchan_to_axi_dma_chan (dchan);struct virt_dma_desc *vdesc;
@@ -419,6 +419,7 @@ static void dw_axi_dma_set_byte_halfword(struct axi_dma_chan *chan, bool set)iowrite32 (val, chan->chip->apb_regs + offset); } +/* Called in chan locked context */ static void axi_chan_block_xfer_start (struct axi_dma_chan *chan,struct axi_dma_desc *first)
@@ -491,7 +492,7 @@ static void axi_chan_start_first_queued(struct axi_dma_chan *chan) desc =vd_to_axi_desc (vd);dev_vdbg (chan2dev (chan),"%s: started %u\n" ,axi_chan_name (chan), - vd->tx.cookie); + vd->tx.cookie);axi_chan_block_xfer_start (chan, desc); }
@@ -592,8 +593,6 @@ static void dw_axi_dma_set_hw_channel(struct axi_dma_chan *chan, bool set) (chan->id * DMA_APB_HS_SEL_BIT_SIZE)); reg_value |= (val << (chan->id *DMA_APB_HS_SEL_BIT_SIZE ));lo_hi_writeq (reg_value, chip->apb_regs +DMAC_APB_HW_HS_SEL_0 ); - -return ; }/*
@@ -1162,7 +1161,7 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id)axi_chan_irq_clear (chan, status);dev_vdbg (chip->dev,"%s %u IRQ status: 0x%08x\n" , -axi_chan_name (chan), i, status); +axi_chan_name (chan), i, status);if (status &DWAXIDMAC_IRQ_ALL_ERR )axi_chan_handle_err (chan, status);
@@ -1451,7 +1450,7 @@ static int axi_req_irqs(struct platform_device *pdev, struct axi_dma_chip *chip)if (chip->irq[i] <0 )return chip->irq[i]; ret =devm_request_irq (chip->dev, chip->irq[i], dw_axi_dma_interrupt, -IRQF_SHARED ,KBUILD_MODNAME , chip); +IRQF_SHARED ,KBUILD_MODNAME , chip);if (ret <0 )return ret; }
@@ -1645,7 +1644,7 @@ static void dw_remove(struct platform_device *pdev)of_dma_controller_free (chip->dev->of_node);list_for_each_entry_safe (chan, _chan, &dw->dma.channels, - vc.chan.device_node) { + vc.chan.device_node) {list_del (&chan->vc.chan.device_node);tasklet_kill (&chan->vc.task); }
Signature · 1 line
2.43.0
Quoted 1 line
Fix the
scripts/checkpatch.plwarning in
…
Quoted 2 lines
---
Changes in v2:
…
Quoted 1 line
- refactor the commit title
…
I would prefer a stricter separation of proposed adjustments.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.19-rc5#n81
Would another small patch series be a bit safer here?
Regards,
Markus
Quoted 8 lines · Markus Elfring
Quoted 1 line
Fix the
scripts/checkpatch.plwarning in…
Quoted 2 lines
---
Changes in v2:…
Quoted 1 line
- refactor the commit title
…
Quoted 7 lines
I would prefer a stricter separation of proposed adjustments.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.19-rc5#n81Would another small patch series be a bit safer here?
Regards,
Markus
I'll separate them into separate patches in the revision.
- alignment
- blank line
- non-useful return.
As this patch fix coding style, this should be considered minor changes and shall not be part of "fixes".
Thanks.
Regards,
Khairul