From: Rosen Penev Date: Thu, 1 May 2025 01:12:48 +0000 (-0700) Subject: ramips: i2s: use devm for debugfs seqfile X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18675%2Fhead;p=thirdparty%2Fopenwrt.git ramips: i2s: use devm for debugfs seqfile Avoids some pointless boilerplate. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18675 Signed-off-by: Robert Marko --- diff --git a/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch index 366521243cb..e53725d4357 100644 --- a/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch +++ b/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch @@ -59,7 +59,7 @@ Signed-off-by: John Crispin +obj-$(CONFIG_SND_RALINK_SOC_I2S) += snd-soc-ralink-i2s.o --- /dev/null +++ b/sound/soc/ralink/ralink-i2s.c -@@ -0,0 +1,939 @@ +@@ -0,0 +1,921 @@ +/* + * Copyright (C) 2010, Lars-Peter Clausen + * Copyright (C) 2016 Michael Lee @@ -200,7 +200,6 @@ Signed-off-by: John Crispin + struct snd_dmaengine_dai_dma_data capture_dma_data; + + struct dentry *dbg_dir; -+ struct dentry *dbg_stats; + struct ralink_i2s_stats txstats; + struct ralink_i2s_stats rxstats; +}; @@ -696,37 +695,20 @@ Signed-off-by: John Crispin + return 0; +} + -+static int ralink_i2s_stats_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, ralink_i2s_stats_show, inode->i_private); -+} -+ -+static const struct file_operations ralink_i2s_stats_ops = { -+ .open = ralink_i2s_stats_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ +static inline int ralink_i2s_debugfs_create(struct ralink_i2s *i2s) +{ + i2s->dbg_dir = debugfs_create_dir(dev_name(i2s->dev), NULL); + if (!i2s->dbg_dir) + return -ENOMEM; + -+ i2s->dbg_stats = debugfs_create_file("stats", S_IRUGO, -+ i2s->dbg_dir, i2s, &ralink_i2s_stats_ops); -+ if (!i2s->dbg_stats) { -+ debugfs_remove(i2s->dbg_dir); -+ return -ENOMEM; -+ } ++ debugfs_create_devm_seqfile(i2s->dev, "stats", i2s->dbg_dir, ++ &ralink_i2s_stats_show); + + return 0; +} + +static inline void ralink_i2s_debugfs_remove(struct ralink_i2s *i2s) +{ -+ debugfs_remove(i2s->dbg_stats); + debugfs_remove(i2s->dbg_dir); +} +#else