From patchwork Wed Apr 17 21:44:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10906217 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 BF7B517E0 for ; Wed, 17 Apr 2019 21:45:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6CCA28A93 for ; Wed, 17 Apr 2019 21:45:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 969B728BAB; Wed, 17 Apr 2019 21:45:12 +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,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 8ABEB28A93 for ; Wed, 17 Apr 2019 21:45:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387769AbfDQVpK (ORCPT ); Wed, 17 Apr 2019 17:45:10 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:40157 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387760AbfDQVo6 (ORCPT ); Wed, 17 Apr 2019 17:44:58 -0400 Received: by mail-pf1-f194.google.com with SMTP id c207so76377pfc.7 for ; Wed, 17 Apr 2019 14:44:58 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=lIt4MnniGUXt5HFFwY7RsZQVGXWVFQnn03GMAZMv05w=; b=pQjPWYZ8KQCukcKogIRBUq835T9hN2vazVLb7Rs7jXrYnLCQqJcQTImf2swZwkSD6s MXWeLjkmrSzmgQx0QLpebogeXm67gfzCJUwCb+flvX+ol+VmyH9IDZXlEgKHTs/OJLBJ 9gz47h5HJg0AEyyWzDkKyJwX6k8k1U83M68M6JH4jnpPKuTuIFHgwuTTOOpyAUDM3az5 SRHZGqOg61JTxaIx4VxWG8fmGukc5UeZ25DCViAHOOrOQ9fdjp6jqliTL9FX4rr0s8eC E4nSfttFPSIcsIQLrrp4U/r2Si6tS3dgAyAHh6bxGZ/1ns7gdjGQEAZvFwOkCdSplWkC hbHg== X-Gm-Message-State: APjAAAU2Vu6X3vnSlBnnh9QOHEDx55yOVAGEzx4Wj/jHPkDJErd6rdpU +sR7vpG4VPAfqA7ES8g1Vlk= X-Google-Smtp-Source: APXvYqw7lqINSjXOr7XNWFUCd4Io302IHtcEKDLnngyoPgw4e/WJ7BKMjP/vlxz3VjaPABuwOn9otA== X-Received: by 2002:a65:625a:: with SMTP id q26mr86247481pgv.68.1555537497867; Wed, 17 Apr 2019 14:44:57 -0700 (PDT) Received: from desktop-bart.svl.corp.google.com ([2620:15c:2cd:203:5cdc:422c:7b28:ebb5]) by smtp.gmail.com with ESMTPSA id d68sm219314pfg.16.2019.04.17.14.44.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 14:44:57 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Himanshu Madhani , Giridhar Malavali Subject: [PATCH 03/34] qla2xxx: Move qla2x00_set_reserved_loop_ids() definition Date: Wed, 17 Apr 2019 14:44:12 -0700 Message-Id: <20190417214443.243152-4-bvanassche@acm.org> X-Mailer: git-send-email 2.20.GIT In-Reply-To: <20190417214443.243152-1-bvanassche@acm.org> References: <20190417214443.243152-1-bvanassche@acm.org> MIME-Version: 1.0 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 Since qla2x00_set_reserved_loop_ids() only has a single caller, move it into the source file from where it is called. Cc: Himanshu Madhani Cc: Giridhar Malavali Signed-off-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_inline.h | 14 -------------- drivers/scsi/qla2xxx/qla_os.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index 7a67169d94a2..d6808d3e0ccb 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -90,20 +90,6 @@ host_to_adap(uint8_t *src, uint8_t *dst, uint32_t bsize) *odest++ = cpu_to_le32(*isrc); } -static inline void -qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha) -{ - int i; - - if (IS_FWI2_CAPABLE(ha)) - return; - - for (i = 0; i < SNS_FIRST_LOOP_ID; i++) - set_bit(i, ha->loop_id_map); - set_bit(MANAGEMENT_SERVER, ha->loop_id_map); - set_bit(BROADCAST, ha->loop_id_map); -} - static inline int qla2x00_is_reserved_id(scsi_qla_host_t *vha, uint16_t loop_id) { diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 466aa35d10cc..a3561e461aa5 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -3984,6 +3984,19 @@ qla2x00_mark_all_devices_lost(scsi_qla_host_t *vha, int defer) } } +static void qla2x00_set_reserved_loop_ids(struct qla_hw_data *ha) +{ + int i; + + if (IS_FWI2_CAPABLE(ha)) + return; + + for (i = 0; i < SNS_FIRST_LOOP_ID; i++) + set_bit(i, ha->loop_id_map); + set_bit(MANAGEMENT_SERVER, ha->loop_id_map); + set_bit(BROADCAST, ha->loop_id_map); +} + /* * qla2x00_mem_alloc * Allocates adapter memory.