Commit 8e638918 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Vinod Koul
Browse files

dmaengine: Use str_enable_disable-like helpers 



Replace ternary (condition ? "enable" : "disable") syntax with helpers
from string_choices.h because:
1. Simple function call with one argument is easier to read.  Ternary
   operator has three arguments and with wrapping might lead to quite
   long code.
2. Is slightly shorter thus also easier to read.
3. It brings uniformity in the text - same string.
4. Allows deduping by the linker, which results in a smaller binary
   file.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> #dw-edma
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20250114191021.854080-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 753f324c

drivers/dma/dw-edma/dw-edma-core.c

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/irq.h>

#include <linux/dma/edma.h>

#include <linux/dma-mapping.h>

#include <linux/string_choices.h>



#include "dw-edma-core.h"

#include "dw-edma-v0-core.h"
@@ -746,7 +747,7 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) 
		chan->ll_max -= 1;



		dev_vdbg(dev, "L. List:\tChannel %s[%u] max_cnt=%u\n",

			 chan->dir == EDMA_DIR_WRITE ? "write" : "read",

			 str_write_read(chan->dir == EDMA_DIR_WRITE),

			 chan->id, chan->ll_max);



		if (dw->nr_irqs == 1)
@@ -767,7 +768,8 @@ static int dw_edma_channel_setup(struct dw_edma *dw, u32 wr_alloc, u32 rd_alloc) 
		memcpy(&chan->msi, &irq->msi, sizeof(chan->msi));



		dev_vdbg(dev, "MSI:\t\tChannel %s[%u] addr=0x%.8x%.8x, data=0x%.8x\n",

			 chan->dir == EDMA_DIR_WRITE  ? "write" : "read", chan->id,

			 str_write_read(chan->dir == EDMA_DIR_WRITE),

			 chan->id,

			 chan->msi.address_hi, chan->msi.address_lo,

			 chan->msi.data);

drivers/dma/imx-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/dmaengine.h>
@@ -942,7 +943,7 @@ static struct dma_async_tx_descriptor *imxdma_prep_dma_interleaved( 
		"   src_sgl=%s dst_sgl=%s numf=%zu frame_size=%zu\n", __func__,

		imxdmac->channel, (unsigned long long)xt->src_start,

		(unsigned long long) xt->dst_start,

		xt->src_sgl ? "true" : "false", xt->dst_sgl ? "true" : "false",

		str_true_false(xt->src_sgl), str_true_false(xt->dst_sgl),

		xt->numf, xt->frame_size);



	if (list_empty(&imxdmac->ld_free) ||

drivers/dma/pxa_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/interrupt.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/dmaengine.h>

#include <linux/platform_device.h>

#include <linux/device.h>
@@ -277,8 +278,7 @@ static int chan_state_show(struct seq_file *s, void *p) 
	seq_printf(s, "\tPriority : %s\n",

			  str_prio[(phy->idx & 0xf) / 4]);

	seq_printf(s, "\tUnaligned transfer bit: %s\n",

			  _phy_readl_relaxed(phy, DALGN) & BIT(phy->idx) ?

			  "yes" : "no");

			  str_yes_no(_phy_readl_relaxed(phy, DALGN) & BIT(phy->idx)));

	seq_printf(s, "\tDCSR  = %08x (%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s)\n",

		   dcsr, PXA_DCSR_STR(RUN), PXA_DCSR_STR(NODESC),

		   PXA_DCSR_STR(STOPIRQEN), PXA_DCSR_STR(EORIRQEN),

drivers/dma/sun6i-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/platform_device.h>

#include <linux/reset.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/types.h>



#include "virt-dma.h"
@@ -553,7 +554,7 @@ static irqreturn_t sun6i_dma_interrupt(int irq, void *dev_id) 
			continue;



		dev_dbg(sdev->slave.dev, "DMA irq status %s: 0x%x\n",

			i ? "high" : "low", status);

			str_high_low(i), status);



		writel(status, sdev->base + DMA_IRQ_STAT(i));

drivers/dma/ti/edma.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/string_choices.h>

#include <linux/of.h>

#include <linux/of_dma.h>

#include <linux/of_irq.h>
@@ -2047,7 +2048,7 @@ static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata, 
	dev_dbg(dev, "num_qchannels: %u\n", ecc->num_qchannels);

	dev_dbg(dev, "num_slots: %u\n", ecc->num_slots);

	dev_dbg(dev, "num_tc: %u\n", ecc->num_tc);

	dev_dbg(dev, "chmap_exist: %s\n", ecc->chmap_exist ? "yes" : "no");

	dev_dbg(dev, "chmap_exist: %s\n", str_yes_no(ecc->chmap_exist));



	/* Nothing need to be done if queue priority is provided */

	if (pdata->queue_priority_mapping)