mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
dmaengine: use dma_chan_name() helper to get per-channel device name
Use the existing dma_chan_name() helper to obtain the per-channel device name instead of open-coding: dev_name(chan->dev->device) / dev_name(chan2dev()). Simplify the code, improve consistency and reduce line wrapping where possible. No functional change intended. Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Reviewed-by: Amelie Delaunay <amelie.delaunay@foss.st.com> # For STM32 Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Frank Li <Frank.Li@nxp.com> Link: https://patch.msgid.link/20260909-dma-chan_dev-rename-v4-2-d8fb6892a70f@nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
parent
75d8640d7f
commit
76574306c1
|
|
@ -760,7 +760,7 @@ static int jz4780_dma_alloc_chan_resources(struct dma_chan *chan)
|
|||
{
|
||||
struct jz4780_dma_chan *jzchan = to_jz4780_dma_chan(chan);
|
||||
|
||||
jzchan->desc_pool = dma_pool_create(dev_name(&chan->dev->device),
|
||||
jzchan->desc_pool = dma_pool_create(dma_chan_name(chan),
|
||||
chan->device->dev,
|
||||
JZ_DMA_DESC_BLOCK_SIZE,
|
||||
PAGE_SIZE, 0);
|
||||
|
|
|
|||
|
|
@ -534,8 +534,7 @@ static int dma_chan_alloc_chan_resources(struct dma_chan *dchan)
|
|||
}
|
||||
|
||||
/* LLI address must be aligned to a 64-byte boundary */
|
||||
chan->desc_pool = dma_pool_create(dev_name(chan2dev(chan)),
|
||||
chan->chip->dev,
|
||||
chan->desc_pool = dma_pool_create(dma_chan_name(dchan), chan->chip->dev,
|
||||
sizeof(struct axi_dma_lli),
|
||||
64, 0);
|
||||
if (!chan->desc_pool) {
|
||||
|
|
|
|||
|
|
@ -507,8 +507,7 @@ static int idma64_alloc_chan_resources(struct dma_chan *chan)
|
|||
struct idma64_chan *idma64c = to_idma64_chan(chan);
|
||||
|
||||
/* Create a pool of consistent memory blocks for hardware descriptors */
|
||||
idma64c->pool = dma_pool_create(dev_name(chan2dev(chan)),
|
||||
chan->device->dev,
|
||||
idma64c->pool = dma_pool_create(dma_chan_name(chan), chan->device->dev,
|
||||
sizeof(struct idma64_lli), 8, 0);
|
||||
if (!idma64c->pool) {
|
||||
dev_err(chan2dev(chan), "No memory for descriptors\n");
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ static int ls2x_dma_alloc_chan_resources(struct dma_chan *chan)
|
|||
struct ls2x_dma_chan *lchan = to_ldma_chan(chan);
|
||||
|
||||
/* Create a pool of consistent memory blocks for hardware descriptors */
|
||||
lchan->pool = dma_pool_create(dev_name(chan2dev(chan)),
|
||||
lchan->pool = dma_pool_create(dma_chan_name(chan),
|
||||
chan->device->dev, PAGE_SIZE,
|
||||
__alignof__(struct ls2x_dma_hw_desc), 0);
|
||||
if (!lchan->pool) {
|
||||
|
|
|
|||
|
|
@ -565,8 +565,7 @@ static int mmp_pdma_alloc_chan_resources(struct dma_chan *dchan)
|
|||
if (chan->desc_pool)
|
||||
return 1;
|
||||
|
||||
chan->desc_pool = dma_pool_create(dev_name(&dchan->dev->device),
|
||||
chan->dev,
|
||||
chan->desc_pool = dma_pool_create(dma_chan_name(dchan), chan->dev,
|
||||
sizeof(struct mmp_pdma_desc_sw),
|
||||
__alignof__(struct mmp_pdma_desc_sw),
|
||||
0);
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ static int st_fdma_alloc_chan_res(struct dma_chan *chan)
|
|||
struct st_fdma_chan *fchan = to_st_fdma_chan(chan);
|
||||
|
||||
/* Create the dma pool for descriptor allocation */
|
||||
fchan->node_pool = dma_pool_create(dev_name(&chan->dev->device),
|
||||
fchan->node_pool = dma_pool_create(dma_chan_name(chan),
|
||||
fchan->fdev->dev,
|
||||
sizeof(struct st_fdma_hw_node),
|
||||
__alignof__(struct st_fdma_hw_node),
|
||||
|
|
|
|||
|
|
@ -1126,7 +1126,7 @@ static int stm32_dma3_alloc_chan_resources(struct dma_chan *c)
|
|||
goto err_put_sync;
|
||||
}
|
||||
|
||||
chan->lli_pool = dmam_pool_create(dev_name(&c->dev->device), c->device->dev,
|
||||
chan->lli_pool = dmam_pool_create(dma_chan_name(c), c->device->dev,
|
||||
sizeof(struct stm32_dma3_hwdesc),
|
||||
__alignof__(struct stm32_dma3_hwdesc), SZ_64K);
|
||||
if (!chan->lli_pool) {
|
||||
|
|
|
|||
|
|
@ -1484,8 +1484,7 @@ static int stm32_mdma_alloc_chan_resources(struct dma_chan *c)
|
|||
struct stm32_mdma_device *dmadev = stm32_mdma_get_dev(chan);
|
||||
int ret;
|
||||
|
||||
chan->desc_pool = dmam_pool_create(dev_name(&c->dev->device),
|
||||
c->device->dev,
|
||||
chan->desc_pool = dmam_pool_create(dma_chan_name(c), c->device->dev,
|
||||
sizeof(struct stm32_mdma_hwdesc),
|
||||
__alignof__(struct stm32_mdma_hwdesc),
|
||||
0);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ TRACE_EVENT(tegra_dma_tx_status,
|
|||
TP_PROTO(struct dma_chan *dc, dma_cookie_t cookie, struct dma_tx_state *state),
|
||||
TP_ARGS(dc, cookie, state),
|
||||
TP_STRUCT__entry(
|
||||
__string(chan, dev_name(&dc->dev->device))
|
||||
__string(chan, dma_chan_name(dc))
|
||||
__field(dma_cookie_t, cookie)
|
||||
__field(__u32, residue)
|
||||
),
|
||||
|
|
@ -28,7 +28,7 @@ TRACE_EVENT(tegra_dma_complete_cb,
|
|||
TP_PROTO(struct dma_chan *dc, int count, void *ptr),
|
||||
TP_ARGS(dc, count, ptr),
|
||||
TP_STRUCT__entry(
|
||||
__string(chan, dev_name(&dc->dev->device))
|
||||
__string(chan, dma_chan_name(dc))
|
||||
__field(int, count)
|
||||
__field(void *, ptr)
|
||||
),
|
||||
|
|
@ -45,7 +45,7 @@ TRACE_EVENT(tegra_dma_isr,
|
|||
TP_PROTO(struct dma_chan *dc, int irq),
|
||||
TP_ARGS(dc, irq),
|
||||
TP_STRUCT__entry(
|
||||
__string(chan, dev_name(&dc->dev->device))
|
||||
__string(chan, dma_chan_name(dc))
|
||||
__field(int, irq)
|
||||
),
|
||||
TP_fast_assign(
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user