Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp350388pxf; Wed, 10 Mar 2021 07:38:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEYP2a+Gdn+ifA8zniDK7gmfaOyiWy9lJA1LAtbZah9LktvGRKyw/SWdFQKuqoijnwCysa X-Received: by 2002:a17:906:c45a:: with SMTP id ck26mr4215213ejb.125.1615390698096; Wed, 10 Mar 2021 07:38:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615390698; cv=none; d=google.com; s=arc-20160816; b=bcv28vFIaUX2FZgQxOaF6WwHqRuKDBaGU3W7wQDwaPIMI0uqzh+uFNm9CXFAJ+zHGG rZ8+9W7sp4fGh4Q4EQemKbAGo3tiIR5DG95TVgZZ2W2OLzSBenw11uIpxfmEy7FU8UJY u4O0pr5w0TrvjjSyXVSOssuA8fIZpPqlnCMR0JbGXRNSi5doLRlUnFsDCfz0iLJ1nc5S iPEveCbzPo4Ku/yw7rhn5BUdI/YoIB5X1+bSCk0Om7b8k+cpb7SHx8oN8TOyAbmvE7f5 eDPE/fgG79BPrTbDW2HRi/7L55n7KiW9P2zjUrDo8VlO3jvLnNxh6mymYrok+T5l339V OW/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:reply-to:cc:from:to :dkim-signature:date; bh=VAaoHzPUuviXWZuHpXivJNsABEQ935p5HTpQ7ZaoB2w=; b=kAqdPM7NZ1olz70NJM/szOAl/GQNSohuK8tcelDTZIKOt5n7BQUlVTiF3UMeuNAgJJ OomAN/iw+/gzYgrPsItZ6gp09ASxUBkIYzEdBEyVolBM8SlRS5R7do0+BDqcaKDTjz4r S0+vgTLwCMdAoKpfdjSN85zLzbhQy5TIiwNZ2GpUr/vIzwzrSepjz9ocSf164xghOdVp TZiX/gD8T+R2gaCIwssyeWx/z4WEUB16Ytw6UTI81lFyW+L8z5RhpPSyN5Y1TbAlwqJC euaQYyUyvX6Xyx0s56FyLJWT/Peh2o3wNuKEEWbwEhyPsFLWdMMd1bA7GNSnrDjoRzk4 t4eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=qKSsMc2q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x10si6709762ejw.389.2021.03.10.07.37.54; Wed, 10 Mar 2021 07:38:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@connolly.tech header.s=protonmail header.b=qKSsMc2q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=connolly.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233155AbhCJPeY (ORCPT + 99 others); Wed, 10 Mar 2021 10:34:24 -0500 Received: from mail1.protonmail.ch ([185.70.40.18]:49202 "EHLO mail1.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232940AbhCJPeB (ORCPT ); Wed, 10 Mar 2021 10:34:01 -0500 Date: Wed, 10 Mar 2021 15:33:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connolly.tech; s=protonmail; t=1615390439; bh=VAaoHzPUuviXWZuHpXivJNsABEQ935p5HTpQ7ZaoB2w=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=qKSsMc2qCKrxizjwbUZwIWkQS+QnQBp7n0S5VJFfOGNTZ5dpJBQSJY0rG7cDe5k7C +WJtx+iGnLxPO4hBfnY1HYUcAHiLGs7po/br+0Ohvq8Ko1d3r9TGxCMSler1fTuUXi FoHtHVQZQvPMWMVvf+Ku52tSx+8bIGBzDtrbvtEQ= To: caleb@connolly.tech, Andy Gross , Bjorn Andersson , Alim Akhtar , Avri Altman , "James E.J. Bottomley" , "Martin K. Petersen" From: Caleb Connolly Cc: ejb@linux.ibm.com, stanley.chu@mediatek.com, cang@codeaurora.org, beanhuo@micron.com, jaegeuk@kernel.org, asutoshd@codeaurora.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Reply-To: Caleb Connolly Subject: [PATCH v3 2/3] scsi: ufs: qcom: use ufshci_version function Message-ID: <20210310153215.371227-3-caleb@connolly.tech> In-Reply-To: <20210310153215.371227-1-caleb@connolly.tech> References: <20210310153215.371227-1-caleb@connolly.tech> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace the UFSHCI_VERSION_xy macros. Signed-off-by: Caleb Connolly --- drivers/scsi/ufs/ufs-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index f97d7b0ae3b6..2d54dce0eeda 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -809,9 +809,9 @@ static u32 ufs_qcom_get_ufs_hci_version(struct ufs_hba = *hba) =09struct ufs_qcom_host *host =3D ufshcd_get_variant(hba); =20 =09if (host->hw_ver.major =3D=3D 0x1) -=09=09return UFSHCI_VERSION_11; +=09=09return ufshci_version(1, 1); =09else -=09=09return UFSHCI_VERSION_20; +=09=09return ufshci_version(2, 0); } =20 /** --=20 2.29.2