Patch from Nicolas Pitre

Those defines are incomplete and not using them by
instead using the explicit flags makes for clearer code.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King