dmaengine: dw-edma: Add dw_edma prefix to debugfs nodes descriptor

Other local names include a "dw_edma" prefix.

Add a "dw_edma" prefix to the debugfs_entries structure, too, so it won't
be confused with global debugfs things.

Link: https://lore.kernel.org/r/20230113171409.30470-13-Sergey.Semin@baikalelectronics.ru
Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
index 6e7f3ef60ca7fcd268c9b5ed49f9f2f15ea298db..2121ffc33cf3cca0e33bcba8981654f33d2d9902 100644 (file)
--- a/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
+++ b/drivers/dma/dw-edma/dw-edma-v0-debugfs.c
@@ -46,7 +46,7 @@ static struct {
        void                                    __iomem *end;
 } lim[2][EDMA_V0_MAX_NR_CH];
 
-struct debugfs_entries {
+struct dw_edma_debugfs_entry {
        const char                              *name;
        void __iomem                            *reg;
 };
@@ -94,7 +94,7 @@ legacy_sel_wr:
 }
 DEFINE_DEBUGFS_ATTRIBUTE(fops_x32, dw_edma_debugfs_u32_get, NULL, "0x%08llx\n");
 
-static void dw_edma_debugfs_create_x32(const struct debugfs_entries entries[],
+static void dw_edma_debugfs_create_x32(const struct dw_edma_debugfs_entry entries[],
                                       int nr_entries, struct dentry *dir)
 {
        int i;
@@ -108,8 +108,7 @@ static void dw_edma_debugfs_create_x32(const struct debugfs_entries entries[],
 static void dw_edma_debugfs_regs_ch(struct dw_edma_v0_ch_regs __iomem *regs,
                                    struct dentry *dir)
 {
-       int nr_entries;
-       const struct debugfs_entries debugfs_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_regs[] = {
                REGISTER(ch_control1),
                REGISTER(ch_control2),
                REGISTER(transfer_size),
@@ -120,6 +119,7 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma_v0_ch_regs __iomem *regs,
                REGISTER(llp.lsb),
                REGISTER(llp.msb),
        };
+       int nr_entries;
 
        nr_entries = ARRAY_SIZE(debugfs_regs);
        dw_edma_debugfs_create_x32(debugfs_regs, nr_entries, dir);
@@ -127,7 +127,7 @@ static void dw_edma_debugfs_regs_ch(struct dw_edma_v0_ch_regs __iomem *regs,
 
 static void dw_edma_debugfs_regs_wr(struct dentry *dir)
 {
-       const struct debugfs_entries debugfs_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_regs[] = {
                /* eDMA global registers */
                WR_REGISTER(engine_en),
                WR_REGISTER(doorbell),
@@ -148,7 +148,7 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir)
                WR_REGISTER(ch67_imwr_data),
                WR_REGISTER(linked_list_err_en),
        };
-       const struct debugfs_entries debugfs_unroll_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_unroll_regs[] = {
                /* eDMA channel context grouping */
                WR_REGISTER_UNROLL(engine_chgroup),
                WR_REGISTER_UNROLL(engine_hshake_cnt.lsb),
@@ -191,7 +191,7 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir)
 
 static void dw_edma_debugfs_regs_rd(struct dentry *dir)
 {
-       const struct debugfs_entries debugfs_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_regs[] = {
                /* eDMA global registers */
                RD_REGISTER(engine_en),
                RD_REGISTER(doorbell),
@@ -213,7 +213,7 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir)
                RD_REGISTER(ch45_imwr_data),
                RD_REGISTER(ch67_imwr_data),
        };
-       const struct debugfs_entries debugfs_unroll_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_unroll_regs[] = {
                /* eDMA channel context grouping */
                RD_REGISTER_UNROLL(engine_chgroup),
                RD_REGISTER_UNROLL(engine_hshake_cnt.lsb),
@@ -256,7 +256,7 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir)
 
 static void dw_edma_debugfs_regs(void)
 {
-       const struct debugfs_entries debugfs_regs[] = {
+       const struct dw_edma_debugfs_entry debugfs_regs[] = {
                REGISTER(ctrl_data_arb_prior),
                REGISTER(ctrl),
        };