scsi: zfcp: remove unnecessary null pointer check before mempool_destroy
authorzhong jiang <zhongjiang@huawei.com>
Thu, 8 Nov 2018 14:44:37 +0000 (15:44 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 15 Nov 2018 20:01:17 +0000 (15:01 -0500)
mempool_destroy has taken null pointer check into account. so remove the
redundant check.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Acked-by: Benjamin Block <bblock@linux.ibm.com>
[maier@linux.ibm.com: depends on v4.3 4e3ca3e033d1 ("mm/mempool: allow NULL `pool' pointer in mempool_destroy()")]
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/s390/scsi/zfcp_aux.c

index 94f4d8fe85e0e5bc595470d8d0e161ab664ae735..e06c3f21e51d21f7d0ba4dde5243ee5dab288949 100644 (file)
@@ -248,20 +248,13 @@ static int zfcp_allocate_low_mem_buffers(struct zfcp_adapter *adapter)
 
 static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter)
 {
-       if (adapter->pool.erp_req)
-               mempool_destroy(adapter->pool.erp_req);
-       if (adapter->pool.scsi_req)
-               mempool_destroy(adapter->pool.scsi_req);
-       if (adapter->pool.scsi_abort)
-               mempool_destroy(adapter->pool.scsi_abort);
-       if (adapter->pool.qtcb_pool)
-               mempool_destroy(adapter->pool.qtcb_pool);
-       if (adapter->pool.status_read_req)
-               mempool_destroy(adapter->pool.status_read_req);
-       if (adapter->pool.sr_data)
-               mempool_destroy(adapter->pool.sr_data);
-       if (adapter->pool.gid_pn)
-               mempool_destroy(adapter->pool.gid_pn);
+       mempool_destroy(adapter->pool.erp_req);
+       mempool_destroy(adapter->pool.scsi_req);
+       mempool_destroy(adapter->pool.scsi_abort);
+       mempool_destroy(adapter->pool.qtcb_pool);
+       mempool_destroy(adapter->pool.status_read_req);
+       mempool_destroy(adapter->pool.sr_data);
+       mempool_destroy(adapter->pool.gid_pn);
 }
 
 /**