[PATCH] OSS: Use ARRAY_SIZE macro when appropriate (2)