From patchwork Thu May 14 21:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 11549877 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00EC414E3 for ; Thu, 14 May 2020 21:36:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5F5120709 for ; Thu, 14 May 2020 21:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728079AbgENVgS (ORCPT ); Thu, 14 May 2020 17:36:18 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:41067 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727929AbgENVgR (ORCPT ); Thu, 14 May 2020 17:36:17 -0400 Received: by mail-pg1-f193.google.com with SMTP id r10so1827608pgv.8 for ; Thu, 14 May 2020 14:36:17 -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=vNqcWeXPZJ3AMKyAWKxWXBU66xmPlLfLnmMbsKeXPuc=; b=KNBjXDNLLowEmnhVXtTXNQ6HVHMsB6zZkLgv0qUiJk6GoQLwebCrvX2dMBbfgH9zxO v5LrAAYEe5at5/Gou8R7c3nRAPPqNy48aB//qOjgXwAqfB0w/zAdkyOaWln1U8kTRRUC kz8D/I8YLGj9q2KiXN1b4phd5+CiVGI19V+iyCRDGwOHVjF1WG/Cz25YBcEnglLz0Jbq o7aAWSf12/rpDqYqfNs+cLQQkfAgzzHK/hz6aY/Wjsj8HPTI43JpTNyrh5mXoHVoP0cn hGIuu8279Wces8NCtTUq8CRt0/OPHp5GrcD2++7NiaSaXM103NTYicShMz5Xx24h6ifK v/zw== X-Gm-Message-State: AOAM530xC6BvuWmHYX/H3w/daPxqDJSzE6c+9M7019aaMVMFACs6IDoG KBHzX6bLenKGDWOdnUFyH+E= X-Google-Smtp-Source: ABdhPJw8Ok2ZqGZ8NQ5395ijPTGSiF1Y9wTZMz+BcTS7/aCyRcShaly7Kc4Z6av5mZEeItuxDX8EeA== X-Received: by 2002:a65:608c:: with SMTP id t12mr142276pgu.46.1589492176486; Thu, 14 May 2020 14:36:16 -0700 (PDT) Received: from localhost.localdomain ([2601:647:4000:d7:6c16:7f27:8c37:e02d]) by smtp.gmail.com with ESMTPSA id a142sm145754pfa.6.2020.05.14.14.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 14:36:15 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Hannes Reinecke , Arun Easi , Bart Van Assche , Nilesh Javali , Daniel Wagner , Himanshu Madhani , Martin Wilck , Roman Bolshakov Subject: [PATCH v6 13/15] qla2xxx: Use make_handle() instead of open-coding it Date: Thu, 14 May 2020 14:35:14 -0700 Message-Id: <20200514213516.25461-14-bvanassche@acm.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200514213516.25461-1-bvanassche@acm.org> References: <20200514213516.25461-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 Cc: Arun Easi Cc: Nilesh Javali Cc: Daniel Wagner Cc: Himanshu Madhani Cc: Hannes Reinecke Cc: Martin Wilck Cc: Roman Bolshakov Signed-off-by: Bart Van Assche Reviewed-by: Hannes Reinecke Reviewed-by: Daniel Wagner Reviewed-by: Himanshu Madhani Reviewed-by: Roman Bolshakov --- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 87d0f5e4d81a..0a9a838c7f20 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -819,7 +819,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) goto skip_rio; switch (mb[0]) { case MBA_SCSI_COMPLETION: - handles[0] = le32_to_cpu((uint32_t)((mb[2] << 16) | mb[1])); + handles[0] = le32_to_cpu(make_handle(mb[2], mb[1])); handle_cnt = 1; break; case MBA_CMPLT_1_16BIT: @@ -858,10 +858,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) mb[0] = MBA_SCSI_COMPLETION; break; case MBA_CMPLT_2_32BIT: - handles[0] = le32_to_cpu((uint32_t)((mb[2] << 16) | mb[1])); - handles[1] = le32_to_cpu( - ((uint32_t)(RD_MAILBOX_REG(ha, reg, 7) << 16)) | - RD_MAILBOX_REG(ha, reg, 6)); + handles[0] = le32_to_cpu(make_handle(mb[2], mb[1])); + handles[1] = + le32_to_cpu(make_handle(RD_MAILBOX_REG(ha, reg, 7), + RD_MAILBOX_REG(ha, reg, 6))); handle_cnt = 2; mb[0] = MBA_SCSI_COMPLETION; break;