New code for 6.2:

 - Minor code cleanup to eliminate unnecessary bit shifting.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>