From patchwork Fri Dec 22 07:31:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suganath Prabu S X-Patchwork-Id: 10128897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B658F60318 for ; Fri, 22 Dec 2017 07:32:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A907529EE0 for ; Fri, 22 Dec 2017 07:32:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DF4829FCE; Fri, 22 Dec 2017 07:32:17 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 3008229EE0 for ; Fri, 22 Dec 2017 07:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753681AbdLVHcQ (ORCPT ); Fri, 22 Dec 2017 02:32:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:44126 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbdLVHcP (ORCPT ); Fri, 22 Dec 2017 02:32:15 -0500 Received: by mail-wm0-f68.google.com with SMTP id t8so20002617wmc.3 for ; Thu, 21 Dec 2017 23:32:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eHdIAFLIRHoawRO7ptBl35XAdlLjbOADqF9Y3jk/Vfc=; b=Fk/snMjH+N4zlkdljlrq0+QaQMSRx73Rw3ubiYdy3rLhV5kkF5cSCXXvzTXFkpuWLu ARV48twSUUDvc7ga14EOE/6YLoYV2eFuSPwZqT3fEn+lEx7PoSZs5pKpkL46tKY0aMEm p+Kn0FPsUgkvMwPUKkYFCtQcch9Dobinay5g0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eHdIAFLIRHoawRO7ptBl35XAdlLjbOADqF9Y3jk/Vfc=; b=dIZ0kzzhErJlkUc6qI4VKrdFyvFDXNoMAzvE/urUue3HVLaabJ6ZPcz7CHYOWETZ4G CJs0JglyRZX2qvRq2OhJnttP5ndL3dlNfCWCKKHDtXqDceLxjx5pJtB5Q6CujyC2Ru5h gXgHJbVyQq3wjJCnn9lJ9HU1rQLtlbSXWXgSDGmqEwb7uxKI+0gt025LhnuM4deppOSp seRFXX5DHZTPfCPwjeXMEEqg9SxqR1NQy39rKRoYAsxmESjnac0UHWBc5i9KgNFSDQaN q5YbpXZ7uo+mTNzV+D9ot3cCKbbJHpQAH9PRpmflq6VOAUT6Sj1xOiEaDFpfxto5Xk57 4bVg== X-Gm-Message-State: AKGB3mKazSGIyQ3+a61ji2qLfhUKXCvxM03SAZdegCN5GyfHcwYm87pH YCUxs1hy4YgbZGu39k557c2do2Hs X-Google-Smtp-Source: ACJfBouB5UELnNwQxB5Wkos7F0fJTZzn6kB8p504mPFJ56l5T8+h1GFIjEK/lBU8G1xgBk8XupKTuA== X-Received: by 10.28.224.4 with SMTP id x4mr11232051wmg.118.1513927934506; Thu, 21 Dec 2017 23:32:14 -0800 (PST) Received: from dhcp-135-24-192-103.dhcp.broadcom.net ([192.19.239.250]) by smtp.googlemail.com with ESMTPSA id b7sm10379462wrd.69.2017.12.21.23.32.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 23:32:13 -0800 (PST) From: Suganath Prabu S To: linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Sathya.Prakash@broadcom.com, sreekanth.reddy@broadcom.com, Hannes Reinecke , Suganath Prabu S , Chaitra P B Subject: [PATCH 01/11] mpt3sas: set default value for cb_idx Date: Thu, 21 Dec 2017 23:31:37 -0800 Message-Id: <1513927907-19735-2-git-send-email-suganath-prabu.subramani@broadcom.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1513927907-19735-1-git-send-email-suganath-prabu.subramani@broadcom.com> References: <1513927907-19735-1-git-send-email-suganath-prabu.subramani@broadcom.com> 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 From: Hannes Reinecke No functional change Signed-off-by: Suganath Prabu S Signed-off-by: Chaitra P B --- drivers/scsi/mpt3sas/modules.order | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/mpt3sas/modules.order b/drivers/scsi/mpt3sas/modules.order index 352a4dd..5052fdf 100644 --- a/drivers/scsi/mpt3sas/modules.order +++ b/drivers/scsi/mpt3sas/modules.order @@ -1 +1 @@ -kernel/drivers/scsi/mpt3sas/mpt3sas.ko +kernel//opt/upstream_io_tag/linux/drivers/scsi/mpt3sas/mpt3sas.ko diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 8027de4..0119a39 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -899,7 +899,7 @@ static u8 _base_get_cb_idx(struct MPT3SAS_ADAPTER *ioc, u16 smid) { int i; - u8 cb_idx; + u8 cb_idx = 0xFF; if (smid < ioc->hi_priority_smid) { i = smid - 1; @@ -910,8 +910,7 @@ _base_get_cb_idx(struct MPT3SAS_ADAPTER *ioc, u16 smid) } else if (smid <= ioc->hba_queue_depth) { i = smid - ioc->internal_smid; cb_idx = ioc->internal_lookup[i].cb_idx; - } else - cb_idx = 0xFF; + } return cb_idx; }