Skip to contentSkip to conversation

spi-dw-core.c: Fix error checking for debugfs_create_dir

PATCH In review Osama Muhammad 3 participants 5 messages May 20, 2023 – May 31, 2023 SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi-dw-core.c: Fix error checking for debugfs_create_dir

This patch fixes the error checking in spi-dw-core.c in debugfs_create_dir. The DebugFS kernel API is developed in a way that the caller can safely ignore the errors that occur during the creation of DebugFS nodes.

---
 drivers/spi/spi-dw-core.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/spi/spi-dw-core.c +2 -6
index ae3108c70f50..c21152a40391 100644
@@ -57,21 +57,18 @@ static const struct debugfs_reg32 dw_spi_dbgfs_regs[] = {
 	DW_SPI_DBGFS_REG("RX_SAMPLE_DLY", DW_SPI_RX_SAMPLE_DLY),
 };
 
-static int dw_spi_debugfs_init(struct dw_spi *dws)
+static void dw_spi_debugfs_init(struct dw_spi *dws)
 {
 	char name[32];
 
 	snprintf(name, 32, "dw_spi%d", dws->master->bus_num);
 	dws->debugfs = debugfs_create_dir(name, NULL);
-	if (!dws->debugfs)
-		return -ENOMEM;
 
 	dws->regset.regs = dw_spi_dbgfs_regs;
 	dws->regset.nregs = ARRAY_SIZE(dw_spi_dbgfs_regs);
 	dws->regset.base = dws->regs;
 	debugfs_create_regset32("registers", 0400, dws->debugfs, &dws->regset);
 
-	return 0;
 }
 
 static void dw_spi_debugfs_remove(struct dw_spi *dws)
@@ -80,9 +77,8 @@ static void dw_spi_debugfs_remove(struct dw_spi *dws)
 }
 
 #else
-static inline int dw_spi_debugfs_init(struct dw_spi *dws)
+static inline void dw_spi_debugfs_init(struct dw_spi *dws)
 {
-	return 0;
 }
 
 static inline void dw_spi_debugfs_remove(struct dw_spi *dws)
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 6 lines · Osama Muhammad

This patch fixes the error checking in spi-dw-core.c in debugfs_create_dir. The DebugFS kernel API is developed in a way that the caller can safely ignore the errors that occur during the creation of DebugFS nodes.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi-dw-core.c: Fix error checking for debugfs_create_dir

      commit: 0178f1e5d9845a31024eddd37e93a182e2dbab5d

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

#2 lore raw

Hi Mark,

Quoted 9 lines · Mark Brown
Quoted 6 lines · Osama Muhammad

This patch fixes the error checking in spi-dw-core.c in debugfs_create_dir. The DebugFS kernel API is developed in a way that the caller can safely ignore the errors that occur during the creation of DebugFS nodes.

Quoted 8 lines

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi-dw-core.c: Fix error checking for debugfs_create_dir

      commit: 0178f1e5d9845a31024eddd37e93a182e2dbab5d

Oh, thanks. I've absolutely missed the respinned version of the patch (it should have been marked as v2 though). Anyway the change looks good except it introduces a redundant empty line at the tail of the dw_spi_debugfs_init() function. Is it possible to rebase the branch and drop the line it? If it's not I'll send an incremental cleanup patch then.

-Serge(y)

Quoted 20 lines

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

maintainer
#3 lore raw
Quoted 6 lines · Serge Semin

Oh, thanks. I've absolutely missed the respinned version of the patch (it should have been marked as v2 though). Anyway the change looks good except it introduces a redundant empty line at the tail of the dw_spi_debugfs_init() function. Is it possible to rebase the branch and drop the line it? If it's not I'll send an incremental cleanup patch then.

I'd rather just take the incremental patch here.

#4 lore raw
Quoted 10 lines · Mark Brown
Quoted 6 lines · Serge Semin

Oh, thanks. I've absolutely missed the respinned version of the patch (it should have been marked as v2 though). Anyway the change looks good except it introduces a redundant empty line at the tail of the dw_spi_debugfs_init() function. Is it possible to rebase the branch and drop the line it? If it's not I'll send an incremental cleanup patch then.

I'd rather just take the incremental patch here.

Done. Please find the cleanup patch here:
https://lore.kernel.org/linux-spi/[email protected]

-Serge(y)