summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVeerabhadrarao Badiganti <vbadigan@codeaurora.org>2018-08-10 14:43:02 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2020-04-28 04:25:05 -0700
commit00677849eb288975576cdca600478da3a13d9d2e (patch)
tree8144655b162b44e3d4eee70a8956f840ada02031 /drivers
parentec8e1d7d894403926e71b24a253f4a32773fd18e (diff)
mmc: host: sdhci-msm-ice: Fix clang warning with NOT operator usage
Make the logical expression more explicit for removing dubiousness. With the present expression, clang warnings are reported. Adding parentheses also generates internal compilation warnings. So used an extra variable for removing ambiguity. Change-Id: Icd55088ca3985091efb4e27ff94f2cfb006a1855 Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org> Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-msm-ice.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-msm-ice.c b/drivers/mmc/host/sdhci-msm-ice.c
index e73bdfd424cc..ca2a411878bf 100644
--- a/drivers/mmc/host/sdhci-msm-ice.c
+++ b/drivers/mmc/host/sdhci-msm-ice.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2017, 2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -301,6 +301,7 @@ void sdhci_msm_ice_hci_update_noncq_cfg(struct sdhci_host *host,
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_msm_host *msm_host = pltfm_host->priv;
unsigned int crypto_params = 0;
+ unsigned int crypto_enable = !bypass;
/*
* The naming convention got changed between ICE2.0 and ICE3.0
* registers fields. Below is the equivalent names for
@@ -311,7 +312,7 @@ void sdhci_msm_ice_hci_update_noncq_cfg(struct sdhci_host *host,
*/
/* Configure ICE bypass mode */
crypto_params |=
- (!bypass & MASK_SDHCI_MSM_ICE_HCI_PARAM_CE)
+ (crypto_enable & MASK_SDHCI_MSM_ICE_HCI_PARAM_CE)
<< OFFSET_SDHCI_MSM_ICE_HCI_PARAM_CE;
/* Configure Crypto Configure Index (CCI) */
crypto_params |= (key_index &