[PATCH] s390: Delete unnecessary checks before the function call "debug_unregister"

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Mon, 16 Nov 2015 14:45:40 +0100

The debug_unregister() function performs also input parameter validation.
Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/s390/cio/chsc_sch.c      | 3 +--
 drivers/s390/cio/cio.c           | 9 +++------
 drivers/s390/cio/qdio_debug.c    | 6 ++----
 drivers/s390/crypto/zcrypt_api.c | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index 213159d..378c571 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -185,8 +185,7 @@ static int __init chsc_init_dbfs(void)
        debug_set_level(chsc_debug_log_id, 2);
        return 0;
 out:
-       if (chsc_debug_msg_id)
-               debug_unregister(chsc_debug_msg_id);
+       debug_unregister(chsc_debug_msg_id);
        return -ENOMEM;
 }
 
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index e0d0295..2d18205 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -76,12 +76,9 @@ static int __init cio_debug_init(void)
        return 0;
 
 out_unregister:
-       if (cio_debug_msg_id)
-               debug_unregister(cio_debug_msg_id);
-       if (cio_debug_trace_id)
-               debug_unregister(cio_debug_trace_id);
-       if (cio_debug_crw_id)
-               debug_unregister(cio_debug_crw_id);
+       debug_unregister(cio_debug_msg_id);
+       debug_unregister(cio_debug_trace_id);
+       debug_unregister(cio_debug_crw_id);
        return -1;
 }
 
diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index f1f3baa..b6fc147 100644
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -366,8 +366,6 @@ void qdio_debug_exit(void)
 {
        qdio_clear_dbf_list();
        debugfs_remove(debugfs_root);
-       if (qdio_dbf_setup)
-               debug_unregister(qdio_dbf_setup);
-       if (qdio_dbf_error)
-               debug_unregister(qdio_dbf_error);
+       debug_unregister(qdio_dbf_setup);
+       debug_unregister(qdio_dbf_error);
 }
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index 9f8fa42..5d3d04c 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -1428,10 +1428,8 @@ int __init zcrypt_debug_init(void)
 void zcrypt_debug_exit(void)
 {
        debugfs_remove(debugfs_root);
-       if (zcrypt_dbf_common)
-               debug_unregister(zcrypt_dbf_common);
-       if (zcrypt_dbf_devices)
-               debug_unregister(zcrypt_dbf_devices);
+       debug_unregister(zcrypt_dbf_common);
+       debug_unregister(zcrypt_dbf_devices);
 }
 
 /**
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/