Commit 5244ac2e authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Vinod Koul
Browse files

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: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Link: https://lore.kernel.org/r/07c1167b671e7b175700e2e7061cf0b3dd8c6adb.1613674948.git.gustavo.pimentel@synopsys.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent da6e0dd5

drivers/dma/dw-edma/dw-edma-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ int dw_edma_remove(struct dw_edma_chip *chip) 
	dma_async_device_unregister(&dw->rd_edma);



	/* Turn debugfs off */

	dw_edma_v0_core_debugfs_off();

	dw_edma_v0_core_debugfs_off(chip);



	return 0;

}

drivers/dma/dw-edma/dw-edma-core.h

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ struct dw_edma { 
	const struct dw_edma_core_ops	*ops;



	raw_spinlock_t			lock;		/* Only for legacy */

#ifdef CONFIG_DEBUG_FS

	struct dentry			*debugfs;

#endif /* CONFIG_DEBUG_FS */

};



struct dw_edma_sg {

drivers/dma/dw-edma/dw-edma-v0-core.c

+2 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void dw_edma_v0_core_debugfs_on(struct dw_edma_chip *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);

}

drivers/dma/dw-edma/dw-edma-v0-core.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

/* eDMA debug fs callbacks */

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 */

drivers/dma/dw-edma/dw-edma-v0-debugfs.c

+13 −9
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#define CHANNEL_STR				"channel"

#define REGISTERS_STR				"registers"



static struct dentry				*base_dir;

static struct dw_edma				*dw;

static struct dw_edma_v0_regs			__iomem *regs;
@@ -272,7 +271,7 @@ static void dw_edma_debugfs_regs(void) 
	struct dentry *regs_dir;

	int nr_entries;



	regs_dir = debugfs_create_dir(REGISTERS_STR, base_dir);

	regs_dir = debugfs_create_dir(REGISTERS_STR, dw->debugfs);

	if (!regs_dir)

		return;
@@ -293,18 +292,23 @@ void dw_edma_v0_debugfs_on(struct dw_edma_chip *chip) 
	if (!regs)

		return;



	base_dir = debugfs_create_dir(dw->name, NULL);

	if (!base_dir)

	dw->debugfs = debugfs_create_dir(dw->name, NULL);

	if (!dw->debugfs)

		return;



	debugfs_create_u32("mf", 0444, base_dir, &dw->mf);

	debugfs_create_u16("wr_ch_cnt", 0444, base_dir, &dw->wr_ch_cnt);

	debugfs_create_u16("rd_ch_cnt", 0444, base_dir, &dw->rd_ch_cnt);

	debugfs_create_u32("mf", 0444, dw->debugfs, &dw->mf);

	debugfs_create_u16("wr_ch_cnt", 0444, dw->debugfs, &dw->wr_ch_cnt);

	debugfs_create_u16("rd_ch_cnt", 0444, dw->debugfs, &dw->rd_ch_cnt);



	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;

}