partid and partname debugfs files were used just by SPI NOR, but they were
replaced by sysfs entries. Since these debugfs files are no longer used in
mtd, remove dead code. The directory is kept as it is used by nandsim,
mtdswap and docg3.
Signed-off-by: Tudor Ambarus <[email protected]>
Reviewed-by: Pratyush Yadav <[email protected]>
---
v2:
- update commit message
- collect R-b tag
drivers/mtd/mtdcore.c | 35 +----------------------------------
include/linux/mtd/mtd.h | 3 ---
2 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 1e7f3bbf847e..7dd105daf19d 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -336,28 +336,6 @@ static const struct device_type mtd_devtype = {
.release = mtd_release,
};
-static int mtd_partid_debug_show(struct seq_file *s, void *p)
-{
- struct mtd_info *mtd = s->private;
-
- seq_printf(s, "%s\n", mtd->dbg.partid);
-
- return 0;
-}
-
-DEFINE_SHOW_ATTRIBUTE(mtd_partid_debug);
-
-static int mtd_partname_debug_show(struct seq_file *s, void *p)
-{
- struct mtd_info *mtd = s->private;
-
- seq_printf(s, "%s\n", mtd->dbg.partname);
-
- return 0;
-}
-
-DEFINE_SHOW_ATTRIBUTE(mtd_partname_debug);
-
static bool mtd_expert_analysis_mode;
#ifdef CONFIG_DEBUG_FS
@@ -377,23 +355,12 @@ static struct dentry *dfs_dir_mtd;
static void mtd_debugfs_populate(struct mtd_info *mtd)
{
- struct mtd_info *master = mtd_get_master(mtd);
struct device *dev = &mtd->dev;
- struct dentry *root;
if (IS_ERR_OR_NULL(dfs_dir_mtd))
return;
- root = debugfs_create_dir(dev_name(dev), dfs_dir_mtd);
- mtd->dbg.dfs_dir = root;
-
- if (master->dbg.partid)
- debugfs_create_file("partid", 0400, root, master,
- &mtd_partid_debug_fops);
-
- if (master->dbg.partname)
- debugfs_create_file("partname", 0400, root, master,
- &mtd_partname_debug_fops);
+ mtd->dbg.dfs_dir = debugfs_create_dir(dev_name(dev), dfs_dir_mtd);
}
#ifndef CONFIG_MMU
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 1b3fc8c71ab3..151607e9d64a 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -188,9 +188,6 @@ struct module; /* only needed for owner field in mtd_info */
*/
struct mtd_debug_info {
struct dentry *dfs_dir;
-
- const char *partname;
- const char *partid;
};
/**
--
2.25.1
Richard,
I talked with Miquel on irc and said that he would like you to review this patch
before considering it for next. No pressure when, just wanted to ask you if you
can add it to your pending review list.
Cheers,
ta
On 2/25/22 16:46, Tudor Ambarus wrote:
> partid and partname debugfs files were used just by SPI NOR, but they were
> replaced by sysfs entries. Since these debugfs files are no longer used in
> mtd, remove dead code. The directory is kept as it is used by nandsim,
> mtdswap and docg3.
>
> Signed-off-by: Tudor Ambarus <[email protected]>
> Reviewed-by: Pratyush Yadav <[email protected]>
> ---
> v2:
> - update commit message
> - collect R-b tag
>
> drivers/mtd/mtdcore.c | 35 +----------------------------------
> include/linux/mtd/mtd.h | 3 ---
> 2 files changed, 1 insertion(+), 37 deletions(-)
>
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 1e7f3bbf847e..7dd105daf19d 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -336,28 +336,6 @@ static const struct device_type mtd_devtype = {
> .release = mtd_release,
> };
>
> -static int mtd_partid_debug_show(struct seq_file *s, void *p)
> -{
> - struct mtd_info *mtd = s->private;
> -
> - seq_printf(s, "%s\n", mtd->dbg.partid);
> -
> - return 0;
> -}
> -
> -DEFINE_SHOW_ATTRIBUTE(mtd_partid_debug);
> -
> -static int mtd_partname_debug_show(struct seq_file *s, void *p)
> -{
> - struct mtd_info *mtd = s->private;
> -
> - seq_printf(s, "%s\n", mtd->dbg.partname);
> -
> - return 0;
> -}
> -
> -DEFINE_SHOW_ATTRIBUTE(mtd_partname_debug);
> -
> static bool mtd_expert_analysis_mode;
>
> #ifdef CONFIG_DEBUG_FS
> @@ -377,23 +355,12 @@ static struct dentry *dfs_dir_mtd;
>
> static void mtd_debugfs_populate(struct mtd_info *mtd)
> {
> - struct mtd_info *master = mtd_get_master(mtd);
> struct device *dev = &mtd->dev;
> - struct dentry *root;
>
> if (IS_ERR_OR_NULL(dfs_dir_mtd))
> return;
>
> - root = debugfs_create_dir(dev_name(dev), dfs_dir_mtd);
> - mtd->dbg.dfs_dir = root;
> -
> - if (master->dbg.partid)
> - debugfs_create_file("partid", 0400, root, master,
> - &mtd_partid_debug_fops);
> -
> - if (master->dbg.partname)
> - debugfs_create_file("partname", 0400, root, master,
> - &mtd_partname_debug_fops);
> + mtd->dbg.dfs_dir = debugfs_create_dir(dev_name(dev), dfs_dir_mtd);
> }
>
> #ifndef CONFIG_MMU
> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
> index 1b3fc8c71ab3..151607e9d64a 100644
> --- a/include/linux/mtd/mtd.h
> +++ b/include/linux/mtd/mtd.h
> @@ -188,9 +188,6 @@ struct module; /* only needed for owner field in mtd_info */
> */
> struct mtd_debug_info {
> struct dentry *dfs_dir;
> -
> - const char *partname;
> - const char *partid;
> };
>
> /**
On Fri, 2022-02-25 at 14:46:56 UTC, Tudor Ambarus wrote:
> partid and partname debugfs files were used just by SPI NOR, but they were
> replaced by sysfs entries. Since these debugfs files are no longer used in
> mtd, remove dead code. The directory is kept as it is used by nandsim,
> mtdswap and docg3.
>
> Signed-off-by: Tudor Ambarus <[email protected]>
> Reviewed-by: Pratyush Yadav <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.
Miquel