| Message ID | 20230518101216.369970-1-asuk4.q@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: core: Remove unnecessary error checks and change return type | expand |
On 18/05/23 13:12, Yeqi Fu wrote: > The error checks in mmc_blk_add_debugfs() and mmc_blk_remove_debugfs() > are extraneous. Therefore, this patch removes all error checks from > both functions. > Additionally, mmc_blk_add_debugfs() has been changed to return void > instead of an integer value that was never used. This simplifies the > function and improves its clarity. > > Signed-off-by: Yeqi Fu <asuk4.q@gmail.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/core/block.c | 25 +++++++------------------ > 1 file changed, 7 insertions(+), 18 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 00c33edb9fb9..81f33200b893 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -2894,12 +2894,12 @@ static const struct file_operations mmc_dbg_ext_csd_fops = { > .llseek = default_llseek, > }; > > -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > { > struct dentry *root; > > if (!card->debugfs_root) > - return 0; > + return; > > root = card->debugfs_root; > > @@ -2908,19 +2908,13 @@ static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > debugfs_create_file_unsafe("status", 0400, root, > card, > &mmc_dbg_card_status_fops); > - if (!md->status_dentry) > - return -EIO; > } > > if (mmc_card_mmc(card)) { > md->ext_csd_dentry = > debugfs_create_file("ext_csd", S_IRUSR, root, card, > &mmc_dbg_ext_csd_fops); > - if (!md->ext_csd_dentry) > - return -EIO; > } > - > - return 0; > } > > static void mmc_blk_remove_debugfs(struct mmc_card *card, > @@ -2929,22 +2923,17 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, > if (!card->debugfs_root) > return; > > - if (!IS_ERR_OR_NULL(md->status_dentry)) { > - debugfs_remove(md->status_dentry); > - md->status_dentry = NULL; > - } > + debugfs_remove(md->status_dentry); > + md->status_dentry = NULL; > > - if (!IS_ERR_OR_NULL(md->ext_csd_dentry)) { > - debugfs_remove(md->ext_csd_dentry); > - md->ext_csd_dentry = NULL; > - } > + debugfs_remove(md->ext_csd_dentry); > + md->ext_csd_dentry = NULL; > } > > #else > > -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > { > - return 0; > } > > static void mmc_blk_remove_debugfs(struct mmc_card *card,
On Thu, 18 May 2023 at 12:13, Yeqi Fu <asuk4.q@gmail.com> wrote: > > The error checks in mmc_blk_add_debugfs() and mmc_blk_remove_debugfs() > are extraneous. Therefore, this patch removes all error checks from > both functions. > Additionally, mmc_blk_add_debugfs() has been changed to return void > instead of an integer value that was never used. This simplifies the > function and improves its clarity. > > Signed-off-by: Yeqi Fu <asuk4.q@gmail.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/block.c | 25 +++++++------------------ > 1 file changed, 7 insertions(+), 18 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 00c33edb9fb9..81f33200b893 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -2894,12 +2894,12 @@ static const struct file_operations mmc_dbg_ext_csd_fops = { > .llseek = default_llseek, > }; > > -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > { > struct dentry *root; > > if (!card->debugfs_root) > - return 0; > + return; > > root = card->debugfs_root; > > @@ -2908,19 +2908,13 @@ static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > debugfs_create_file_unsafe("status", 0400, root, > card, > &mmc_dbg_card_status_fops); > - if (!md->status_dentry) > - return -EIO; > } > > if (mmc_card_mmc(card)) { > md->ext_csd_dentry = > debugfs_create_file("ext_csd", S_IRUSR, root, card, > &mmc_dbg_ext_csd_fops); > - if (!md->ext_csd_dentry) > - return -EIO; > } > - > - return 0; > } > > static void mmc_blk_remove_debugfs(struct mmc_card *card, > @@ -2929,22 +2923,17 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, > if (!card->debugfs_root) > return; > > - if (!IS_ERR_OR_NULL(md->status_dentry)) { > - debugfs_remove(md->status_dentry); > - md->status_dentry = NULL; > - } > + debugfs_remove(md->status_dentry); > + md->status_dentry = NULL; > > - if (!IS_ERR_OR_NULL(md->ext_csd_dentry)) { > - debugfs_remove(md->ext_csd_dentry); > - md->ext_csd_dentry = NULL; > - } > + debugfs_remove(md->ext_csd_dentry); > + md->ext_csd_dentry = NULL; > } > > #else > > -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) > { > - return 0; > } > > static void mmc_blk_remove_debugfs(struct mmc_card *card, > -- > 2.37.2 >
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 00c33edb9fb9..81f33200b893 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2894,12 +2894,12 @@ static const struct file_operations mmc_dbg_ext_csd_fops = { .llseek = default_llseek, }; -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) { struct dentry *root; if (!card->debugfs_root) - return 0; + return; root = card->debugfs_root; @@ -2908,19 +2908,13 @@ static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) debugfs_create_file_unsafe("status", 0400, root, card, &mmc_dbg_card_status_fops); - if (!md->status_dentry) - return -EIO; } if (mmc_card_mmc(card)) { md->ext_csd_dentry = debugfs_create_file("ext_csd", S_IRUSR, root, card, &mmc_dbg_ext_csd_fops); - if (!md->ext_csd_dentry) - return -EIO; } - - return 0; } static void mmc_blk_remove_debugfs(struct mmc_card *card, @@ -2929,22 +2923,17 @@ static void mmc_blk_remove_debugfs(struct mmc_card *card, if (!card->debugfs_root) return; - if (!IS_ERR_OR_NULL(md->status_dentry)) { - debugfs_remove(md->status_dentry); - md->status_dentry = NULL; - } + debugfs_remove(md->status_dentry); + md->status_dentry = NULL; - if (!IS_ERR_OR_NULL(md->ext_csd_dentry)) { - debugfs_remove(md->ext_csd_dentry); - md->ext_csd_dentry = NULL; - } + debugfs_remove(md->ext_csd_dentry); + md->ext_csd_dentry = NULL; } #else -static int mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) +static void mmc_blk_add_debugfs(struct mmc_card *card, struct mmc_blk_data *md) { - return 0; } static void mmc_blk_remove_debugfs(struct mmc_card *card,
The error checks in mmc_blk_add_debugfs() and mmc_blk_remove_debugfs() are extraneous. Therefore, this patch removes all error checks from both functions. Additionally, mmc_blk_add_debugfs() has been changed to return void instead of an integer value that was never used. This simplifies the function and improves its clarity. Signed-off-by: Yeqi Fu <asuk4.q@gmail.com> --- drivers/mmc/core/block.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)