[PATCH] mmc: sdhci: Use upper/lower_32_bits macros

[Michal Simek]

st 29. 7. 2020 v 15:44 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> Instead of recasting and shifting use macros which are designed for taking
> upper/lower 32bit value from 64bit variable.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  drivers/mmc/sdhci.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
> index ec6c493fb642..f5fbbacee542 100644
> --- a/drivers/mmc/sdhci.c
> +++ b/drivers/mmc/sdhci.c
> @@ -749,9 +749,9 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
>                                             "sdhci-caps-mask", 0);
>         dt_caps = dev_read_u64_default(host->mmc->dev,
>                                        "sdhci-caps", 0);
> -       caps = ~(u32)dt_caps_mask &
> +       caps = ~lower_32_bits(dt_caps_mask) &
>                sdhci_readl(host, SDHCI_CAPABILITIES);
> -       caps |= (u32)dt_caps;
> +       caps |= lower_32_bits(dt_caps);
>  #else
>         caps = sdhci_readl(host, SDHCI_CAPABILITIES);
>  #endif
> @@ -794,9 +794,9 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
>         /* Check whether the clock multiplier is supported or not */
>         if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) {
>  #if CONFIG_IS_ENABLED(DM_MMC)
> -               caps_1 = ~(u32)(dt_caps_mask >> 32) &
> +               caps_1 = ~upper_32_bits(dt_caps_mask) &
>                          sdhci_readl(host, SDHCI_CAPABILITIES_1);
> -               caps_1 |= (u32)(dt_caps >> 32);
> +               caps_1 |= upper_32_bits(dt_caps);
>  #else
>                 caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
>  #endif
> --
> 2.27.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs