linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Cotton <danielcotton.mailinglists@gmail.com>
To: axboe@fb.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH RESEND] drivers/block/mtip32xx: Fix incorrect warning
Date: Sun, 12 Oct 2014 22:25:38 +1030	[thread overview]
Message-ID: <543A6C3A.4070408@gmail.com> (raw)

Prevent mtip32xx block driver from showing a warning at load time 
("Error creating debugfs parent") when debugfs is not included in
the kernel. If debugfs is included, show the error code. Fixes bug
55831 in the Bugzilla.

Signed-off-by: Daniel Cotton <danielcotton.patches@gmail.com>
---
  drivers/block/mtip32xx/mtip32xx.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/block/mtip32xx/mtip32xx.c 
b/drivers/block/mtip32xx/mtip32xx.c
index 5c8e7fe..1124c61 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4686,16 +4686,19 @@ static int __init mtip_init(void)
  	mtip_major = error;

  	dfs_parent = debugfs_create_dir("rssd", NULL);
-	if (IS_ERR_OR_NULL(dfs_parent)) {
-		pr_warn("Error creating debugfs parent\n");
+	if (IS_ERR_OR_NULL(dfs_parent) && PTR_ERR(dfs_parent) != -ENODEV) {
+		pr_warn("Error creating debugfs parent, error code: %ld\n",
+			PTR_ERR(dfs_parent));
  		dfs_parent = NULL;
  	}
  	if (dfs_parent) {
  		dfs_device_status = debugfs_create_file("device_status",
  					S_IRUGO, dfs_parent, NULL,
  					&mtip_device_status_fops);
-		if (IS_ERR_OR_NULL(dfs_device_status)) {
-			pr_err("Error creating device_status node\n");
+		if (IS_ERR_OR_NULL(dfs_device_status) &&
+		    PTR_ERR(dfs_device_status) != -ENODEV) {
+			pr_err("Error creating device_status node, error code: %ld\n",
+				PTR_ERR(dfs_device_status));
  			dfs_device_status = NULL;
  		}
  	}

             reply	other threads:[~2014-10-12 11:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-12 11:55 Daniel Cotton [this message]
2014-10-13 14:41 ` [PATCH RESEND] drivers/block/mtip32xx: Fix incorrect warning Jens Axboe
2014-10-17 16:45   ` Daniel Cotton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=543A6C3A.4070408@gmail.com \
    --to=danielcotton.mailinglists@gmail.com \
    --cc=axboe@fb.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).