On Sat, Sep 08, 2018 at 05:41:45PM +0800, zhong jiang wrote: > mempool_destroy has taken null pointer check into account. so remove the > redundant check. > > Signed-off-by: zhong jiang <zhongjiang@xxxxxxxxxx> > --- > drivers/s390/scsi/zfcp_aux.c | 21 +++++++-------------- > 1 file changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c > index 94f4d8f..e06c3f2 100644 > --- a/drivers/s390/scsi/zfcp_aux.c > +++ b/drivers/s390/scsi/zfcp_aux.c > @@ -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); > } > Acked-by: Benjamin Block <bblock@xxxxxxxxxxxxx> Thank you. We'll send it along when we next send patches upstream. -- With Best Regards, Benjamin Block / Linux on IBM Z Kernel Development IBM Systems & Technology Group / IBM Deutschland Research & Development GmbH Vorsitz. AufsR.: Martina Koederitz / Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: AmtsG Stuttgart, HRB 243294