Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f36f88a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: host: sdhci-msm-ice: Fix clang warning with NOT operator usage"

parents 528f2c93 d01055f7

drivers/mmc/host/sdhci-msm-ice.c

+2 −1
Original line number Diff line number Diff line
@@ -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 &