Skip to content

Commit 66aac8e

Browse files
nxpfranklivinodkoul
authored andcommitted
dmaengine: fsl-edma: clean up EXPORT_SYMBOL_GPL in fsl-edma-common.c
Exported functions in fsl-edma-common.c are only used within fsl-edma.c and mcf-edma.c. Global export is unnecessary. This commit removes all EXPORT_SYMBOL_GPL in fsl-edma-common.c, and renames fsl-edma.c and mcf-edma.c to maintain the same final module names as before, thereby simplifying the codebase. Signed-off-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20230821161617.2142561-3-Frank.Li@nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 8b9aee8 commit 66aac8e

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

drivers/dma/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ obj-$(CONFIG_DW_DMAC_CORE) += dw/
3232
obj-$(CONFIG_DW_EDMA) += dw-edma/
3333
obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
3434
obj-$(CONFIG_FSL_DMA) += fsldma.o
35-
obj-$(CONFIG_FSL_EDMA) += fsl-edma.o fsl-edma-common.o
36-
obj-$(CONFIG_MCF_EDMA) += mcf-edma.o fsl-edma-common.o
35+
fsl-edma-objs := fsl-edma-main.o fsl-edma-common.o
36+
obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
37+
mcf-edma-objs := mcf-edma-main.o fsl-edma-common.o
38+
obj-$(CONFIG_MCF_EDMA) += mcf-edma.o
3739
obj-$(CONFIG_FSL_QDMA) += fsl-qdma.o
3840
obj-$(CONFIG_FSL_RAID) += fsl_raid.o
3941
obj-$(CONFIG_HISI_DMA) += hisi_dma.o

drivers/dma/fsl-edma-common.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ void fsl_edma_disable_request(struct fsl_edma_chan *fsl_chan)
7575
iowrite8(EDMA_CEEI_CEEI(ch), regs->ceei);
7676
}
7777
}
78-
EXPORT_SYMBOL_GPL(fsl_edma_disable_request);
7978

8079
static void mux_configure8(struct fsl_edma_chan *fsl_chan, void __iomem *addr,
8180
u32 off, u32 slot, bool enable)
@@ -126,7 +125,6 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
126125
else
127126
mux_configure8(fsl_chan, muxaddr, ch_off, slot, enable);
128127
}
129-
EXPORT_SYMBOL_GPL(fsl_edma_chan_mux);
130128

131129
static unsigned int fsl_edma_get_tcd_attr(enum dma_slave_buswidth addr_width)
132130
{
@@ -155,7 +153,6 @@ void fsl_edma_free_desc(struct virt_dma_desc *vdesc)
155153
fsl_desc->tcd[i].ptcd);
156154
kfree(fsl_desc);
157155
}
158-
EXPORT_SYMBOL_GPL(fsl_edma_free_desc);
159156

160157
int fsl_edma_terminate_all(struct dma_chan *chan)
161158
{
@@ -172,7 +169,6 @@ int fsl_edma_terminate_all(struct dma_chan *chan)
172169
vchan_dma_desc_free_list(&fsl_chan->vchan, &head);
173170
return 0;
174171
}
175-
EXPORT_SYMBOL_GPL(fsl_edma_terminate_all);
176172

177173
int fsl_edma_pause(struct dma_chan *chan)
178174
{
@@ -188,7 +184,6 @@ int fsl_edma_pause(struct dma_chan *chan)
188184
spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
189185
return 0;
190186
}
191-
EXPORT_SYMBOL_GPL(fsl_edma_pause);
192187

193188
int fsl_edma_resume(struct dma_chan *chan)
194189
{
@@ -204,7 +199,6 @@ int fsl_edma_resume(struct dma_chan *chan)
204199
spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
205200
return 0;
206201
}
207-
EXPORT_SYMBOL_GPL(fsl_edma_resume);
208202

209203
static void fsl_edma_unprep_slave_dma(struct fsl_edma_chan *fsl_chan)
210204
{
@@ -265,7 +259,6 @@ int fsl_edma_slave_config(struct dma_chan *chan,
265259

266260
return 0;
267261
}
268-
EXPORT_SYMBOL_GPL(fsl_edma_slave_config);
269262

270263
static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan,
271264
struct virt_dma_desc *vdesc, bool in_progress)
@@ -340,7 +333,6 @@ enum dma_status fsl_edma_tx_status(struct dma_chan *chan,
340333

341334
return fsl_chan->status;
342335
}
343-
EXPORT_SYMBOL_GPL(fsl_edma_tx_status);
344336

345337
static void fsl_edma_set_tcd_regs(struct fsl_edma_chan *fsl_chan,
346338
struct fsl_edma_hw_tcd *tcd)
@@ -520,7 +512,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
520512

521513
return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);
522514
}
523-
EXPORT_SYMBOL_GPL(fsl_edma_prep_dma_cyclic);
524515

525516
struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
526517
struct dma_chan *chan, struct scatterlist *sgl,
@@ -589,7 +580,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
589580

590581
return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);
591582
}
592-
EXPORT_SYMBOL_GPL(fsl_edma_prep_slave_sg);
593583

594584
struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan,
595585
dma_addr_t dma_dst, dma_addr_t dma_src,
@@ -612,7 +602,6 @@ struct dma_async_tx_descriptor *fsl_edma_prep_memcpy(struct dma_chan *chan,
612602

613603
return vchan_tx_prep(&fsl_chan->vchan, &fsl_desc->vdesc, flags);
614604
}
615-
EXPORT_SYMBOL_GPL(fsl_edma_prep_memcpy);
616605

617606
void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan)
618607
{
@@ -629,7 +618,6 @@ void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan)
629618
fsl_chan->status = DMA_IN_PROGRESS;
630619
fsl_chan->idle = false;
631620
}
632-
EXPORT_SYMBOL_GPL(fsl_edma_xfer_desc);
633621

634622
void fsl_edma_issue_pending(struct dma_chan *chan)
635623
{
@@ -649,7 +637,6 @@ void fsl_edma_issue_pending(struct dma_chan *chan)
649637

650638
spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
651639
}
652-
EXPORT_SYMBOL_GPL(fsl_edma_issue_pending);
653640

654641
int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
655642
{
@@ -660,7 +647,6 @@ int fsl_edma_alloc_chan_resources(struct dma_chan *chan)
660647
32, 0);
661648
return 0;
662649
}
663-
EXPORT_SYMBOL_GPL(fsl_edma_alloc_chan_resources);
664650

665651
void fsl_edma_free_chan_resources(struct dma_chan *chan)
666652
{
@@ -683,7 +669,6 @@ void fsl_edma_free_chan_resources(struct dma_chan *chan)
683669
fsl_chan->tcd_pool = NULL;
684670
fsl_chan->is_sw = false;
685671
}
686-
EXPORT_SYMBOL_GPL(fsl_edma_free_chan_resources);
687672

688673
void fsl_edma_cleanup_vchan(struct dma_device *dmadev)
689674
{
@@ -695,7 +680,6 @@ void fsl_edma_cleanup_vchan(struct dma_device *dmadev)
695680
tasklet_kill(&chan->vchan.task);
696681
}
697682
}
698-
EXPORT_SYMBOL_GPL(fsl_edma_cleanup_vchan);
699683

700684
/*
701685
* On the 32 channels Vybrid/mpc577x edma version (here called "v1"),
@@ -743,6 +727,5 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma)
743727

744728
edma->regs.tcd = edma->membase + EDMA_TCD;
745729
}
746-
EXPORT_SYMBOL_GPL(fsl_edma_setup_regs);
747730

748731
MODULE_LICENSE("GPL v2");
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)