Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6e975c5 authored by Markus Elfring's avatar Markus Elfring Committed by Martin Schwidefsky
Browse files

s390: Delete unnecessary checks before the function call "debug_unregister" 



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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 69eea95c

drivers/s390/cio/chsc_sch.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -185,7 +185,6 @@ static int __init chsc_init_dbfs(void) 
	debug_set_level(chsc_debug_log_id, 2);

	debug_set_level(chsc_debug_log_id, 2);

	return 0;

	return 0;

out:

out:

	if (chsc_debug_msg_id)

	debug_unregister(chsc_debug_msg_id);

	debug_unregister(chsc_debug_msg_id);

	return -ENOMEM;

	return -ENOMEM;

}

}

drivers/s390/cio/cio.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -76,11 +76,8 @@ static int __init cio_debug_init(void) 
	return 0;

	return 0;





out_unregister:

out_unregister:

	if (cio_debug_msg_id)

	debug_unregister(cio_debug_msg_id);

	debug_unregister(cio_debug_msg_id);

	if (cio_debug_trace_id)

	debug_unregister(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_crw_id);

	return -1;

	return -1;

}

}

drivers/s390/cio/qdio_debug.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -366,8 +366,6 @@ void qdio_debug_exit(void) 
{

{

	qdio_clear_dbf_list();

	qdio_clear_dbf_list();

	debugfs_remove(debugfs_root);

	debugfs_remove(debugfs_root);

	if (qdio_dbf_setup)

	debug_unregister(qdio_dbf_setup);

	debug_unregister(qdio_dbf_setup);

	if (qdio_dbf_error)

	debug_unregister(qdio_dbf_error);

	debug_unregister(qdio_dbf_error);

}
 
}

drivers/s390/crypto/zcrypt_api.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1428,9 +1428,7 @@ int __init zcrypt_debug_init(void) 
void zcrypt_debug_exit(void)

void zcrypt_debug_exit(void)

{

{

	debugfs_remove(debugfs_root);

	debugfs_remove(debugfs_root);

	if (zcrypt_dbf_common)

	debug_unregister(zcrypt_dbf_common);

	debug_unregister(zcrypt_dbf_common);

	if (zcrypt_dbf_devices)

	debug_unregister(zcrypt_dbf_devices);

	debug_unregister(zcrypt_dbf_devices);

}

}