From patchwork Thu Oct 1 02:55:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 7303661 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AF7029F444 for ; Thu, 1 Oct 2015 02:57:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB1D320781 for ; Thu, 1 Oct 2015 02:57:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E138204D8 for ; Thu, 1 Oct 2015 02:57:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755520AbbJAC5O (ORCPT ); Wed, 30 Sep 2015 22:57:14 -0400 Received: from m50-133.163.com ([123.125.50.133]:48730 "EHLO m50-133.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509AbbJAC5N (ORCPT ); Wed, 30 Sep 2015 22:57:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=KLQXQCaJZiEFMVCT1+ 4+COxSzIE1cdIasJMjzrTFz9o=; b=SLGV9Z9OVz0/4uReiNsxwlUKmQXbi2yCLZ 0IjNs8DmFU0ZGrB3I20HBNJQwL+rCbmIjtcQQbvsYPWiFYvWdjAURifUNfkksIPh cLItoMXLUdkSL3TI0g44ys2vLQLd0LpLXePC+tab7bFAdXaRcn7UB7F8gzQS6n7O 4cK+nTpeE= Received: from localhost (unknown [116.77.128.85]) by smtp3 (Coremail) with SMTP id DdGowEAZXIe2oAxWw73iBg--.28205S3; Thu, 01 Oct 2015 10:55:50 +0800 (CST) From: Geliang Tang To: "James E.J. Bottomley" , Michael Neuling , Wen Xiong , "Matthew R. Ochs" , "Manoj N. Kumar" Cc: Geliang Tang , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] cxlflash: drop unlikely before IS_ERR_OR_NULL Date: Thu, 1 Oct 2015 10:55:31 +0800 Message-Id: <7685ffa3f47126617d740292cf35bf92cda193c3.1443667610.git.geliangtang@163.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> References: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> In-Reply-To: <081982d1188978b6020952afb4c2dcf3bc42fa1f.1443667610.git.geliangtang@163.com> References: <03d18502ed7ed417f136c091f417d2d88c147ec6.1443667610.git.geliangtang@163.com> <081982d1188978b6020952afb4c2dcf3bc42fa1f.1443667610.git.geliangtang@163.com> X-CM-TRANSID: DdGowEAZXIe2oAxWw73iBg--.28205S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JrWxZr1kuF1rArW3Cw1fCrg_yoWDKrcEgr 4q9397XrWxuF92yw1IgwsxZrWqvFWkZFWIyw1SkrnYvasru3s3XrWkJr92vr4Ygr4j9r9x CF1UZr1Ykr1UWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUMmh5UUUUU== X-Originating-IP: [116.77.128.85] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbivxSGmVWBNatRTgABsg Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it. Signed-off-by: Geliang Tang Acked-by: Manoj Kumar Acked-by: Matthew R. Ochs --- drivers/scsi/cxlflash/superpipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c index f1b62ce..eb1b01e 100644 --- a/drivers/scsi/cxlflash/superpipe.c +++ b/drivers/scsi/cxlflash/superpipe.c @@ -1307,7 +1307,7 @@ static int cxlflash_disk_attach(struct scsi_device *sdev, } ctx = cxl_dev_context_init(cfg->dev); - if (unlikely(IS_ERR_OR_NULL(ctx))) { + if (IS_ERR_OR_NULL(ctx)) { dev_err(dev, "%s: Could not initialize context %p\n", __func__, ctx); rc = -ENODEV; @@ -1432,7 +1432,7 @@ static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi) struct afu *afu = cfg->afu; ctx = cxl_dev_context_init(cfg->dev); - if (unlikely(IS_ERR_OR_NULL(ctx))) { + if (IS_ERR_OR_NULL(ctx)) { dev_err(dev, "%s: Could not initialize context %p\n", __func__, ctx); rc = -ENODEV;