leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmaengine: dw-edma: Move struct dentry variable from static definition into dw_edma struct

Browse Source 
Move struct dentry variable from static definition (dw-edma-v0-debugfs.c)
into dw_edma struct (dw-edma-core.h)

Also the variable was renamed from base_dir to debugfs.

Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Link: https://lore.kernel.org/r/07c1167b671e7b175700e2e7061cf0b3dd8c6adb.1613674948.git.gustavo.pimentel@synopsys.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Gustavo Pimentel 2021-02-18 20:04:05 +01:00 committed by Vinod Koul
parent da6e0dd541
commit 5244ac2e2e
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/dw-edma/dw-edma-core.c
View File

@ -1003,7 +1003,7 @@ int dw_edma_remove(struct dw_edma_chip *chip)
dma_async_device_unregister(&dw->rd_edma); dma_async_device_unregister(&dw->rd_edma);
/* Turn debugfs off */ /* Turn debugfs off */
dw_edma_v0_core_debugfs_off(); dw_edma_v0_core_debugfs_off(chip);
return 0; return 0;
} }

3
drivers/dma/dw-edma/dw-edma-core.h
View File

@ -137,6 +137,9 @@ struct dw_edma {
const struct dw_edma_core_ops *ops; const struct dw_edma_core_ops *ops;
raw_spinlock_t lock; /* Only for legacy */ raw_spinlock_t lock; /* Only for legacy */
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs;
#endif /* CONFIG_DEBUG_FS */
}; };
struct dw_edma_sg { struct dw_edma_sg {

4
drivers/dma/dw-edma/dw-edma-v0-core.c
View File

@ -506,7 +506,7 @@ void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip)
dw_edma_v0_debugfs_on(chip); dw_edma_v0_debugfs_on(chip);
} }
void dw_edma_v0_core_debugfs_off(void) void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip)
{ {
dw_edma_v0_debugfs_off(); dw_edma_v0_debugfs_off(chip);
} }

2
drivers/dma/dw-edma/dw-edma-v0-core.h
View File

@ -23,6 +23,6 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first);
int dw_edma_v0_core_device_config(struct dw_edma_chan *chan); int dw_edma_v0_core_device_config(struct dw_edma_chan *chan);
/* eDMA debug fs callbacks */ /* eDMA debug fs callbacks */
void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip); void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip);
void dw_edma_v0_core_debugfs_off(void); void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip);
#endif /* _DW_EDMA_V0_CORE_H */ #endif /* _DW_EDMA_V0_CORE_H */

22
drivers/dma/dw-edma/dw-edma-v0-debugfs.c
View File

@ -38,7 +38,6 @@
#define CHANNEL_STR "channel" #define CHANNEL_STR "channel"
#define REGISTERS_STR "registers" #define REGISTERS_STR "registers"
static struct dentry *base_dir;
static struct dw_edma *dw; static struct dw_edma *dw;
static struct dw_edma_v0_regs __iomem *regs; static struct dw_edma_v0_regs __iomem *regs;
@ -272,7 +271,7 @@ static void dw_edma_debugfs_regs(void)
struct dentry *regs_dir; struct dentry *regs_dir;
int nr_entries; int nr_entries;
regs_dir = debugfs_create_dir(REGISTERS_STR, base_dir); regs_dir = debugfs_create_dir(REGISTERS_STR, dw->debugfs);
if (!regs_dir) if (!regs_dir)
return; return;
@ -293,18 +292,23 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)
if (!regs) if (!regs)
return; return;
base_dir = debugfs_create_dir(dw->name, NULL); dw->debugfs = debugfs_create_dir(dw->name, NULL);
if (!base_dir) if (!dw->debugfs)
return; return;
debugfs_create_u32("mf", 0444, base_dir, &dw->mf); debugfs_create_u32("mf", 0444, dw->debugfs, &dw->mf);
debugfs_create_u16("wr_ch_cnt", 0444, base_dir, &dw->wr_ch_cnt); debugfs_create_u16("wr_ch_cnt", 0444, dw->debugfs, &dw->wr_ch_cnt);
debugfs_create_u16("rd_ch_cnt", 0444, base_dir, &dw->rd_ch_cnt); debugfs_create_u16("rd_ch_cnt", 0444, dw->debugfs, &dw->rd_ch_cnt);
dw_edma_debugfs_regs(); dw_edma_debugfs_regs();
} }
void dw_edma_v0_debugfs_off(void) void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip)
{ {
debugfs_remove_recursive(base_dir); dw = chip->dw;
if (!dw)
return;
debugfs_remove_recursive(dw->debugfs);
dw->debugfs = NULL;
} }

4
drivers/dma/dw-edma/dw-edma-v0-debugfs.h
View File

@ -13,13 +13,13 @@
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip); void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip);
void dw_edma_v0_debugfs_off(void); void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip);
#else #else
static inline void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip) static inline void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip)
{ {
} }
static inline void dw_edma_v0_debugfs_off(void) static inline void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip)
{ {
} }
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */