mmc: cavium: Use clamp to simplify cvm_mmc_set_clock

[PATCH] mmc: cavium: Use clamp to simplify cvm_mmc_set_clock

Posted by Thorsten Blum 1 month, 2 weeks ago

Use clamp() to simplify cvm_mmc_set_clock() and improve its readability.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/mmc/host/cavium.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mmc/host/cavium.c b/drivers/mmc/host/cavium.c
index 9a55db0e657c..37a88f2a0c86 100644
--- a/drivers/mmc/host/cavium.c
+++ b/drivers/mmc/host/cavium.c
@@ -905,9 +905,7 @@ static void cvm_mmc_set_clock(struct cvm_mmc_slot *slot, unsigned int clock)
 {
 	struct mmc_host *mmc = slot->mmc;
 
-	clock = min(clock, mmc->f_max);
-	clock = max(clock, mmc->f_min);
-	slot->clock = clock;
+	slot->clock = clamp(clock, mmc->f_min, mmc->f_max);
 }
 
 static int cvm_mmc_init_lowlevel(struct cvm_mmc_slot *slot)
-- 
Thorsten Blum <thorsten.blum@linux.dev>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4

Re: [PATCH] mmc: cavium: Use clamp to simplify cvm_mmc_set_clock

Posted by Ulf Hansson 1 month, 1 week ago

On Mon, 22 Dec 2025 at 11:03, Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Use clamp() to simplify cvm_mmc_set_clock() and improve its readability.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/cavium.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/cavium.c b/drivers/mmc/host/cavium.c
> index 9a55db0e657c..37a88f2a0c86 100644
> --- a/drivers/mmc/host/cavium.c
> +++ b/drivers/mmc/host/cavium.c
> @@ -905,9 +905,7 @@ static void cvm_mmc_set_clock(struct cvm_mmc_slot *slot, unsigned int clock)
>  {
>         struct mmc_host *mmc = slot->mmc;
>
> -       clock = min(clock, mmc->f_max);
> -       clock = max(clock, mmc->f_min);
> -       slot->clock = clock;
> +       slot->clock = clamp(clock, mmc->f_min, mmc->f_max);
>  }
>
>  static int cvm_mmc_init_lowlevel(struct cvm_mmc_slot *slot)
> --
> Thorsten Blum <thorsten.blum@linux.dev>
> GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
>