On Wed, 12 Jun 2019 at 10:26, Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> When calling debugfs functions, there is no need to ever check the
> return value. The function can work or not, but the code logic should
> never do something different based on this.
>
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Cc: <linux-mmc@xxxxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Series applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/core/debugfs.c | 56 ++++++-------------------------------
> drivers/mmc/core/mmc_test.c | 10 +------
> 2 files changed, 9 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
> index d2275c5a2311..cc3be259bc42 100644
> --- a/drivers/mmc/core/debugfs.c
> +++ b/drivers/mmc/core/debugfs.c
> @@ -230,45 +230,21 @@ void mmc_add_host_debugfs(struct mmc_host *host)
> struct dentry *root;
>
> root = debugfs_create_dir(mmc_hostname(host), NULL);
> - if (IS_ERR(root))
> - /* Don't complain -- debugfs just isn't enabled */
> - return;
> - if (!root)
> - /* Complain -- debugfs is enabled, but it failed to
> - * create the directory. */
> - goto err_root;
> -
> host->debugfs_root = root;
>
> - if (!debugfs_create_file("ios", S_IRUSR, root, host, &mmc_ios_fops))
> - goto err_node;
> -
> - if (!debugfs_create_x32("caps", S_IRUSR, root, &host->caps))
> - goto err_node;
> -
> - if (!debugfs_create_x32("caps2", S_IRUSR, root, &host->caps2))
> - goto err_node;
> -
> - if (!debugfs_create_file("clock", S_IRUSR | S_IWUSR, root, host,
> - &mmc_clock_fops))
> - goto err_node;
> + debugfs_create_file("ios", S_IRUSR, root, host, &mmc_ios_fops);
> + debugfs_create_x32("caps", S_IRUSR, root, &host->caps);
> + debugfs_create_x32("caps2", S_IRUSR, root, &host->caps2);
> + debugfs_create_file("clock", S_IRUSR | S_IWUSR, root, host,
> + &mmc_clock_fops);
>
> #ifdef CONFIG_FAIL_MMC_REQUEST
> if (fail_request)
> setup_fault_attr(&fail_default_attr, fail_request);
> host->fail_mmc_request = fail_default_attr;
> - if (IS_ERR(fault_create_debugfs_attr("fail_mmc_request",
> - root,
> - &host->fail_mmc_request)))
> - goto err_node;
> + fault_create_debugfs_attr("fail_mmc_request", root,
> + &host->fail_mmc_request);
> #endif
> - return;
> -
> -err_node:
> - debugfs_remove_recursive(root);
> - host->debugfs_root = NULL;
> -err_root:
> - dev_err(&host->class_dev, "failed to initialize debugfs\n");
> }
>
> void mmc_remove_host_debugfs(struct mmc_host *host)
> @@ -285,25 +261,9 @@ void mmc_add_card_debugfs(struct mmc_card *card)
> return;
>
> root = debugfs_create_dir(mmc_card_id(card), host->debugfs_root);
> - if (IS_ERR(root))
> - /* Don't complain -- debugfs just isn't enabled */
> - return;
> - if (!root)
> - /* Complain -- debugfs is enabled, but it failed to
> - * create the directory. */
> - goto err;
> -
> card->debugfs_root = root;
>
> - if (!debugfs_create_x32("state", S_IRUSR, root, &card->state))
> - goto err;
> -
> - return;
> -
> -err:
> - debugfs_remove_recursive(root);
> - card->debugfs_root = NULL;
> - dev_err(&card->dev, "failed to initialize debugfs\n");
> + debugfs_create_x32("state", S_IRUSR, root, &card->state);
> }
>
> void mmc_remove_card_debugfs(struct mmc_card *card)
> diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
> index b27df2d2b5ae..492dd4596314 100644
> --- a/drivers/mmc/core/mmc_test.c
> +++ b/drivers/mmc/core/mmc_test.c
> @@ -3167,15 +3167,7 @@ static int __mmc_test_register_dbgfs_file(struct mmc_card *card,
> struct mmc_test_dbgfs_file *df;
>
> if (card->debugfs_root)
> - file = debugfs_create_file(name, mode, card->debugfs_root,
> - card, fops);
> -
> - if (IS_ERR_OR_NULL(file)) {
> - dev_err(&card->dev,
> - "Can't create %s. Perhaps debugfs is disabled.\n",
> - name);
> - return -ENODEV;
> - }
> + debugfs_create_file(name, mode, card->debugfs_root, card, fops);
>
> df = kmalloc(sizeof(*df), GFP_KERNEL);
> if (!df) {
> --
> 2.22.0
>
