I think that you can then also replace clamp_t() with clamp()
The use of clamp_t() is to avoid egregious macro expansion in clamp(). After the series improving min/max the clamp() is probably equivalent. But in 5.15 it will likely not be. So this is, in line with the purpose of this change, I believe necesasry.
Maybe that should be in the commit message?
Andrew