From patchwork Wed Aug 29 14:04:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10580383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F121D139B for ; Wed, 29 Aug 2018 14:04:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0A512B0AA for ; Wed, 29 Aug 2018 14:04:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D40EA2B2C8; Wed, 29 Aug 2018 14:04:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7981C2B0AA for ; Wed, 29 Aug 2018 14:04:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728476AbeH2SBp (ORCPT ); Wed, 29 Aug 2018 14:01:45 -0400 Received: from mout.gmx.net ([212.227.15.19]:37117 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728117AbeH2SBp (ORCPT ); Wed, 29 Aug 2018 14:01:45 -0400 Received: from localhost.localdomain ([113.116.156.74]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0Ldq9D-1fUARF0Wfr-00j0zb; Wed, 29 Aug 2018 16:04:18 +0200 From: Chengguang Xu To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, gedwards@ddn.com Cc: linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH v2] virtio_scsi: remove unnecessary condition check Date: Wed, 29 Aug 2018 22:04:04 +0800 Message-Id: <20180829140404.17281-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:3V7ETGN0IZDpoCXnFdWtVIWL0iAcfMMKgDcfpe+DrnyLvoXedWC Bb0vyY7rTMmGyE7Q3TP55wTlmt1K9l/J8GT8K7fQhhHyWexfHQoQUuwvU+EIG5m0w+w4ma+ Q36Zef/53jxeEG3pl/yMrGtkx+QLEI21x+gc8PgS6UD/54e1P7UeyQtAELmdpeb0LRVeEyY BWT/3zI8c2bDoYRUtbt0w== X-UI-Out-Filterresults: notjunk:1;V01:K0:BglDP3KSJKk=:obzEG0jeoAmq6HqkjhmXrh ZpF+A0U+ZwOFLAauiFhnGI0keK4vb3n6VRAmDpboakzgFjMv2E9flrGppTszCjv/tYELCQnCw nmvUOS5ea4H6dBWSaVww0DXnzgLq+iMc8IlNOjjRxqrADg5RDujMUZCUksXu+hLMXuXiOmg6C Z/ptS98CYfLqZkt6mby0BpGEHnjGygQTXaYLFayAhGTE8PXVz+aAYhzLl+tYShOHOFnNh8J88 Nt/xRwKAqLFv3w4MZtJdrLErW2vVxG6swt25QItMbpQDVJJpFXbYJ/0hU1t1hPYKSFADBiyKZ PfxmeaCsHriz7PNIRGqRD7pEAxmvjC0U/mNRbEdWRivNc98hZStTdjqiyzatM6VA3fSL0R/zc FF25lShxRP3RSCfrv3G8FBciXOlux8qM3WZYV+ZJicxBzVxGSoxghJw68k/HtTPKLyCQsxfwe lJ25/7bZF4DM73x3IzlsDS9qjRsANvlCYTgiuUAUObX+VL6/qQ3isSSbZFPw8nLAmw60v52FB DpmFS4oCh6a5SDNL4zHuNgzWg8mjGWnu7i3PTv9l44/jzf7ZKFoVmz6ezFehXsyMmGhpDsrYR 1X4ko6Kt8bxRy3FUwpnuOdauSXJbDnS6FpNVry6v602qmVGz2bewgs+pPqfj21WBHpfFGlT79 W46d+96IwvKCIOiKNqPLRFFP99pFPaT3dfoyVISgaZhfkeiVr/2icRA0VlQtAemntpFlrBN4D b22NJrnYMzNG05DwsP3cYkb63hSz1ak//+sXHYVB3rEmFR2NrydOGK5Scz0= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kmem_cache_destroy()/mempool_destroy() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling kmem_cache_destroy()/mempool_destroy(). Meanwhile, because this is in the error case of init function, also remove unnecessary NULL assignment. Signed-off-by: Chengguang Xu Reviewed-by: Greg Edwards --- v1->v2: - Remove unnecessary NULL assignment. drivers/scsi/virtio_scsi.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 1c72db94270e..7574bec59a41 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -1012,14 +1012,8 @@ static int __init init(void) return 0; error: - if (virtscsi_cmd_pool) { - mempool_destroy(virtscsi_cmd_pool); - virtscsi_cmd_pool = NULL; - } - if (virtscsi_cmd_cache) { - kmem_cache_destroy(virtscsi_cmd_cache); - virtscsi_cmd_cache = NULL; - } + mempool_destroy(virtscsi_cmd_pool); + kmem_cache_destroy(virtscsi_cmd_cache); return ret; }