Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2354102pxb; Mon, 8 Mar 2021 23:43:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSCA/tfXyETDwOwTeEMR1AS+SDDRsPe4xiq1pGQOXW1xGIYSi5tpcKXQtC3RVDlXhleByI X-Received: by 2002:aa7:d656:: with SMTP id v22mr2540058edr.119.1615275812773; Mon, 08 Mar 2021 23:43:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615275812; cv=none; d=google.com; s=arc-20160816; b=MSVV78gdMUxjS3LBxKTeQthSlESZPi3hcKZWZhDTYAz5bchAx5JzykyQa7TdsCrLPS LmBrf0Pa81tM7KeR7ZOQryHWxx8PYlwFpM8aPCTazh0hU8gV8TsiWd1f9DXXfboC0Sw/ lQ2XpM6QfrDJk0gaUU12gyQsMy95ZqobIlfaTVPZ/QROHzd8WSl3voG5jYnyPWVnVYMD 74sacxMXBLXE1H1XXZikpXiUwqI5O2FpVKunYWWjYpCg0h5AJ23vZrdftKPV9SdJu+AG f8B1vW15knxOr+p0Dx9q7iFaih7Z07KusUVkMcmx0rjtZ87VuSSoux/qG5+wdiHhV4jF hoLw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=KbV+SfCubtqdOftAIHCxJ7FznXZ3hV2iW/0IfhczYoA=; b=ut99AC+f/QGLuvGCBjMnocS3JOvlm5WiwXGc7jxyQxarJo9Yzpzm73s1NVCQeAuB50 rhnqnPaRgeHfNuPOPN9OHs7k8Ji8adYUiO2H+6TGScYNiSPdOWNikNIXBs1TkhjIEOMY IgjKQ8TYnsD5L1OJQL97N9sv33XAR4Dd25cDHKYUf/LL2PsHmUTXvGYEEW1OmuNLl7Dh /sJvjqLNzldWF3MIWhpLdsfPBX1Ss/q/3E1JbtOrbQr+Dh2u1AQxyNRIEG7FZkbos5lu Rw1+jiP07LSdrdyeSPs+WwrbL4FW81oxqWKG+QFniRyYZ33wJbCAUCu9xuY4C6zd2wLo LupQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SpvJZ4wW; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ga18si8481132ejb.632.2021.03.08.23.43.09; Mon, 08 Mar 2021 23:43:32 -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=@gmail.com header.s=20161025 header.b=SpvJZ4wW; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229530AbhCIHmC (ORCPT + 99 others); Tue, 9 Mar 2021 02:42:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbhCIHlc (ORCPT ); Tue, 9 Mar 2021 02:41:32 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85CB2C06174A; Mon, 8 Mar 2021 23:41:32 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id kx1so430951pjb.3; Mon, 08 Mar 2021 23:41:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KbV+SfCubtqdOftAIHCxJ7FznXZ3hV2iW/0IfhczYoA=; b=SpvJZ4wWpOT2LTF+tQ9RC3xdilBpPpt+tQIIHiP6cFikUdBPXexK0xgOae6paVqQCS +v4gPd3HaURw8AOehSFeJ/RbAzTWtjOC+7CMx2vY3hWIzuGJ44AR7IlfERK/F9m0OS1c nn/upJ9RUJT92pj9mcreHgU6FIWlyPo9kh3Oqys6E9jt41wfD1Vw0qjHNkTx9y6362q7 gFDmZsd1QED4iOvqUP4CfIqLYIoRyUUb4hgdODivMyfGlnH7E4NuOQIeFduA9XwSkYQT fcV7ZOLIBOeMkFMcF9wW5b4jSKIhT7lNF3zagbB2qrgeUvUfJB5W2Frh1wUnB6IGfETM uyKQ== 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:mime-version :content-transfer-encoding; bh=KbV+SfCubtqdOftAIHCxJ7FznXZ3hV2iW/0IfhczYoA=; b=JSXdEMYEuOryDuGGXYCbCfAsCDiLEH1njlANNgWtiDQDJLVaDT1fPS+J+dOMzCECK6 pzBUMCNCEO2LLvYGEJLT1xWBhBDhwHfHhveXYCyeLhYvIlJRkn6dOCfekKNn4ix4drvz BRbJXjDe+wQqeW/ZZnWofR+4obgPS98wtLzRcxmggKK48wN23Lun7CbTYBpIY3v2GC+h eY0xmUFiG/ZbTDX0dK6eLLXYD/ABJfehrFsN/W/Rt/e+b23hX1xnt4qxfV8YF6RJqra7 HMJcQYqXUmxjF3D/Fd6Arjj75BsuFcLhVRfTz3gEHXpa1pC/HwhByBjdhPAxJ6h0VePZ H6Zw== X-Gm-Message-State: AOAM530xLI0/theTZ3wzmhriGQgfOEXDVpBBlQlsYAYzH5N5n0wG8yxU /WB4lqFHLRG2bqXA+NFXTwo= X-Received: by 2002:a17:90a:bc06:: with SMTP id w6mr3303034pjr.44.1615275691981; Mon, 08 Mar 2021 23:41:31 -0800 (PST) Received: from tj.ccdomain.com ([103.220.76.197]) by smtp.gmail.com with ESMTPSA id bb24sm1806966pjb.5.2021.03.08.23.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 23:41:31 -0800 (PST) From: Yue Hu To: martin.petersen@oracle.com, jejb@linux.ibm.com, alim.akhtar@samsung.com, avri.altman@wdc.com, stanley.chu@mediatek.com, cang@codeaurora.org, beanhuo@micron.com, jaegeuk@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, huyue2@yulong.com, zbestahu@163.com Subject: [PATCH] scsi: ufs: Remove unnecessary null checks in ufshcd_find_max_sup_active_icc_level() Date: Tue, 9 Mar 2021 15:40:51 +0800 Message-Id: <20210309074051.506-1-zbestahu@gmail.com> X-Mailer: git-send-email 2.29.2.windows.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yue Hu Since vcc/vccq/vccq2 have already been null checked before using. Signed-off-by: Yue Hu --- drivers/scsi/ufs/ufshcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 7b3267e..f941bc3 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7145,19 +7145,19 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, goto out; } - if (hba->vreg_info.vcc && hba->vreg_info.vcc->max_uA) + if (hba->vreg_info.vcc->max_uA) icc_level = ufshcd_get_max_icc_level( hba->vreg_info.vcc->max_uA, POWER_DESC_MAX_ACTV_ICC_LVLS - 1, &desc_buf[PWR_DESC_ACTIVE_LVLS_VCC_0]); - if (hba->vreg_info.vccq && hba->vreg_info.vccq->max_uA) + if (hba->vreg_info.vccq->max_uA) icc_level = ufshcd_get_max_icc_level( hba->vreg_info.vccq->max_uA, icc_level, &desc_buf[PWR_DESC_ACTIVE_LVLS_VCCQ_0]); - if (hba->vreg_info.vccq2 && hba->vreg_info.vccq2->max_uA) + if (hba->vreg_info.vccq2->max_uA) icc_level = ufshcd_get_max_icc_level( hba->vreg_info.vccq2->max_uA, icc_level, -- 1.9.1