From patchwork Tue Apr 4 17:17:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dick Kennedy X-Patchwork-Id: 9662219 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 53794602BA for ; Tue, 4 Apr 2017 17:26:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4198E28423 for ; Tue, 4 Apr 2017 17:26:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35D5628491; Tue, 4 Apr 2017 17:26:27 +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=-6.9 required=2.0 tests=BAYES_00,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 DF38D28423 for ; Tue, 4 Apr 2017 17:26:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753783AbdDDR0Z (ORCPT ); Tue, 4 Apr 2017 13:26:25 -0400 Received: from lpdvrndsmtp01.broadcom.com ([192.19.229.170]:38163 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755151AbdDDRZl (ORCPT ); Tue, 4 Apr 2017 13:25:41 -0400 Received: from pallmd1.broadcom.com (pallmd1.ash.broadcom.net [10.85.232.165]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 9B27330C0AA for ; Tue, 4 Apr 2017 10:17:45 -0700 (PDT) Received: from lvnvda1400.lvn.broadcom.net (lvnvda1400.lvn.broadcom.net [10.75.197.131]) by pallmd1.broadcom.com (Postfix) with ESMTP id 106BE360056; Tue, 4 Apr 2017 13:17:29 -0400 (EDT) Received: from lvnvda1400.lvn.broadcom.net (localhost.localdomain [127.0.0.1]) by lvnvda1400.lvn.broadcom.net (8.14.4/8.14.4) with ESMTP id v34HHT1t011343; Tue, 4 Apr 2017 10:17:29 -0700 Received: (from rkennedy@localhost) by lvnvda1400.lvn.broadcom.net (8.14.4/8.14.4/Submit) id v34HHSCA011342; Tue, 4 Apr 2017 10:17:28 -0700 From: Dick Kennedy To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , Dick Kennedy , James Smart Subject: [lpfc 09/19] Fix Kconfig defines. Date: Tue, 4 Apr 2017 10:17:02 -0700 Message-Id: <1491326232-11255-10-git-send-email-rkennedy@broadcom.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1491326232-11255-1-git-send-email-rkennedy@broadcom.com> References: <1491326232-11255-1-git-send-email-rkennedy@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: Dick Kennedy One of the idefs in the previous kconfig patch was not corrected. Also one alingment issue fixed. Signed-off-by: Dick Kennedy Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_nvme.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 9e66cb0..0e28c2e 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c @@ -3335,7 +3335,7 @@ LPFC_ATTR_R(enable_fc4_type, LPFC_ENABLE_FCP, * percentage will go to NVME. */ LPFC_ATTR_R(xri_split, 50, 10, 90, - "Division of XRI resources between SCSI and NVME"); + "Division of XRI resources between SCSI and NVME"); /* # lpfc_log_verbose: Only turn this flag on if you are willing to risk being diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 9726c95..9d39093 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -2264,7 +2264,7 @@ lpfc_nvme_destroy_localport(struct lpfc_vport *vport) void lpfc_nvme_update_localport(struct lpfc_vport *vport) { -#ifdef CONFIG_LPFC_NVME_INITIATOR +#if (IS_ENABLED(CONFIG_NVME_FC)) struct nvme_fc_local_port *localport; struct lpfc_nvme_lport *lport;