From eae78fb98c45f23d76bf4224710f80d853f2c3ce Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 26 Mar 2014 03:20:04 +0000 Subject: [PATCH] scst_local: Remove two superfluous tests The to_scst_lcl_sess() macro is based on container_of() and hence never returns NULL. Hence remove the two tests that compare the result of that macro against NULL. Signed-off-by: Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5385 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst_local/scst_local.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index 5953ae38e..e872bdeaa 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -1657,11 +1657,6 @@ static int scst_local_driver_remove(struct device *dev) TRACE_ENTRY(); sess = to_scst_lcl_sess(dev); - if (!sess) { - PRINT_ERROR("%s", "Unable to locate sess info"); - return -ENODEV; - } - scsi_remove_host(sess->shost); scsi_host_put(sess->shost); @@ -1726,8 +1721,6 @@ static void scst_local_release_adapter(struct device *dev) TRACE_ENTRY(); sess = to_scst_lcl_sess(dev); - if (sess == NULL) - goto out; /* * At this point the SCSI device is almost gone because the SCSI @@ -1760,7 +1753,6 @@ static void scst_local_release_adapter(struct device *dev) scst_unregister_session(sess->scst_sess, false, scst_local_free_sess); -out: TRACE_EXIT(); return; }