The new macro simplifies the code, reduces the likelihood of errors,
and makes the code easier to read.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>