mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
dmaengine: dw-edma: Stop checking debugfs_create_*() return value
The debugfs_create_*() functions never return NULL, so checking their return value for NULL is pointless. Secondly, the debugfs subsystem is designed to be as simple as possible, so if one of the debugfs_create_*() method in a hierarchy fails, the following methods should silently return the passed erroneous parental dentry. Finally, the code should work no matter whether anything debugfs-related fails. To make code simpler and debugfs-independent, stop checking the debugfs_create_*() return values. If the debugfs file system is unavailable, skip the debugfs node initialization altogether to preserve some memory space. Link: https://lore.kernel.org/r/20230113171409.30470-12-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>
This commit is contained in:
parent
7ca9f025a7
commit
37d058aae7
1 changed files with 5 additions and 15 deletions
|
@ -100,9 +100,8 @@ static void dw_edma_debugfs_create_x32(const struct debugfs_entries entries[],
|
|||
int i;
|
||||
|
||||
for (i = 0; i < nr_entries; i++) {
|
||||
if (!debugfs_create_file_unsafe(entries[i].name, 0444, dir,
|
||||
entries[i].reg, &fops_x32))
|
||||
break;
|
||||
debugfs_create_file_unsafe(entries[i].name, 0444, dir,
|
||||
entries[i].reg, &fops_x32);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -168,8 +167,6 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir)
|
|||
char name[16];
|
||||
|
||||
regs_dir = debugfs_create_dir(WRITE_STR, dir);
|
||||
if (!regs_dir)
|
||||
return;
|
||||
|
||||
nr_entries = ARRAY_SIZE(debugfs_regs);
|
||||
dw_edma_debugfs_create_x32(debugfs_regs, nr_entries, regs_dir);
|
||||
|
@ -184,8 +181,6 @@ static void dw_edma_debugfs_regs_wr(struct dentry *dir)
|
|||
snprintf(name, sizeof(name), "%s:%d", CHANNEL_STR, i);
|
||||
|
||||
ch_dir = debugfs_create_dir(name, regs_dir);
|
||||
if (!ch_dir)
|
||||
return;
|
||||
|
||||
dw_edma_debugfs_regs_ch(®s->type.unroll.ch[i].wr, ch_dir);
|
||||
|
||||
|
@ -237,8 +232,6 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir)
|
|||
char name[16];
|
||||
|
||||
regs_dir = debugfs_create_dir(READ_STR, dir);
|
||||
if (!regs_dir)
|
||||
return;
|
||||
|
||||
nr_entries = ARRAY_SIZE(debugfs_regs);
|
||||
dw_edma_debugfs_create_x32(debugfs_regs, nr_entries, regs_dir);
|
||||
|
@ -253,8 +246,6 @@ static void dw_edma_debugfs_regs_rd(struct dentry *dir)
|
|||
snprintf(name, sizeof(name), "%s:%d", CHANNEL_STR, i);
|
||||
|
||||
ch_dir = debugfs_create_dir(name, regs_dir);
|
||||
if (!ch_dir)
|
||||
return;
|
||||
|
||||
dw_edma_debugfs_regs_ch(®s->type.unroll.ch[i].rd, ch_dir);
|
||||
|
||||
|
@ -273,8 +264,6 @@ static void dw_edma_debugfs_regs(void)
|
|||
int nr_entries;
|
||||
|
||||
regs_dir = debugfs_create_dir(REGISTERS_STR, dw->debugfs);
|
||||
if (!regs_dir)
|
||||
return;
|
||||
|
||||
nr_entries = ARRAY_SIZE(debugfs_regs);
|
||||
dw_edma_debugfs_create_x32(debugfs_regs, nr_entries, regs_dir);
|
||||
|
@ -285,6 +274,9 @@ static void dw_edma_debugfs_regs(void)
|
|||
|
||||
void dw_edma_v0_debugfs_on(struct dw_edma *_dw)
|
||||
{
|
||||
if (!debugfs_initialized())
|
||||
return;
|
||||
|
||||
dw = _dw;
|
||||
if (!dw)
|
||||
return;
|
||||
|
@ -294,8 +286,6 @@ void dw_edma_v0_debugfs_on(struct dw_edma *_dw)
|
|||
return;
|
||||
|
||||
dw->debugfs = debugfs_create_dir(dw->name, NULL);
|
||||
if (!dw->debugfs)
|
||||
return;
|
||||
|
||||
debugfs_create_u32("mf", 0444, dw->debugfs, &dw->chip->mf);
|
||||
debugfs_create_u16("wr_ch_cnt", 0444, dw->debugfs, &dw->wr_ch_cnt);
|
||||
|
|
Loading…
Reference in a new issue