Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Gustavo Pimentel and committed by
Vinod Koul
5244ac2e da6e0dd5

+22 -15
+1 -1
drivers/dma/dw-edma/dw-edma-core.c
··· 1003 1003 dma_async_device_unregister(&dw->rd_edma); 1004 1004 1005 1005 /* Turn debugfs off */ 1006 - dw_edma_v0_core_debugfs_off(); 1006 + dw_edma_v0_core_debugfs_off(chip); 1007 1007 1008 1008 return 0; 1009 1009 }
+3
drivers/dma/dw-edma/dw-edma-core.h
··· 137 137 const struct dw_edma_core_ops *ops; 138 138 139 139 raw_spinlock_t lock; /* Only for legacy */ 140 + #ifdef CONFIG_DEBUG_FS 141 + struct dentry *debugfs; 142 + #endif /* CONFIG_DEBUG_FS */ 140 143 }; 141 144 142 145 struct dw_edma_sg {
+2 -2
drivers/dma/dw-edma/dw-edma-v0-core.c
··· 506 506 dw_edma_v0_debugfs_on(chip); 507 507 } 508 508 509 - void dw_edma_v0_core_debugfs_off(void) 509 + void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip) 510 510 { 511 - dw_edma_v0_debugfs_off(); 511 + dw_edma_v0_debugfs_off(chip); 512 512 }
+1 -1
drivers/dma/dw-edma/dw-edma-v0-core.h
··· 23 23 int dw_edma_v0_core_device_config(struct dw_edma_chan *chan); 24 24 /* eDMA debug fs callbacks */ 25 25 void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *chip); 26 - void dw_edma_v0_core_debugfs_off(void); 26 + void dw_edma_v0_core_debugfs_off(struct dw_edma_chip *chip); 27 27 28 28 #endif /* _DW_EDMA_V0_CORE_H */
+13 -9
drivers/dma/dw-edma/dw-edma-v0-debugfs.c
··· 38 38 #define CHANNEL_STR "channel" 39 39 #define REGISTERS_STR "registers" 40 40 41 - static struct dentry *base_dir; 42 41 static struct dw_edma *dw; 43 42 static struct dw_edma_v0_regs __iomem *regs; 44 43 ··· 271 272 struct dentry *regs_dir; 272 273 int nr_entries; 273 274 274 - regs_dir = debugfs_create_dir(REGISTERS_STR, base_dir); 275 + regs_dir = debugfs_create_dir(REGISTERS_STR, dw->debugfs); 275 276 if (!regs_dir) 276 277 return; 277 278 ··· 292 293 if (!regs) 293 294 return; 294 295 295 - base_dir = debugfs_create_dir(dw->name, NULL); 296 - if (!base_dir) 296 + dw->debugfs = debugfs_create_dir(dw->name, NULL); 297 + if (!dw->debugfs) 297 298 return; 298 299 299 - debugfs_create_u32("mf", 0444, base_dir, &dw->mf); 300 - debugfs_create_u16("wr_ch_cnt", 0444, base_dir, &dw->wr_ch_cnt); 301 - debugfs_create_u16("rd_ch_cnt", 0444, base_dir, &dw->rd_ch_cnt); 300 + debugfs_create_u32("mf", 0444, dw->debugfs, &dw->mf); 301 + debugfs_create_u16("wr_ch_cnt", 0444, dw->debugfs, &dw->wr_ch_cnt); 302 + debugfs_create_u16("rd_ch_cnt", 0444, dw->debugfs, &dw->rd_ch_cnt); 302 303 303 304 dw_edma_debugfs_regs(); 304 305 } 305 306 306 - void dw_edma_v0_debugfs_off(void) 307 + void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip) 307 308 { 308 - debugfs_remove_recursive(base_dir); 309 + dw = chip->dw; 310 + if (!dw) 311 + return; 312 + 313 + debugfs_remove_recursive(dw->debugfs); 314 + dw->debugfs = NULL; 309 315 }
+2 -2
drivers/dma/dw-edma/dw-edma-v0-debugfs.h
··· 13 13 14 14 #ifdef CONFIG_DEBUG_FS 15 15 void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip); 16 - void dw_edma_v0_debugfs_off(void); 16 + void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip); 17 17 #else 18 18 static inline void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip) 19 19 { 20 20 } 21 21 22 - static inline void dw_edma_v0_debugfs_off(void) 22 + static inline void dw_edma_v0_debugfs_off(struct dw_edma_chip *chip) 23 23 { 24 24 } 25 25 #endif /* CONFIG_DEBUG_FS */