diff --git a/include/common/standard.h b/include/common/standard.h
index a06fb84461..d88599de44 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -317,9 +317,9 @@ extern int ishex(char s);
  */
 static inline int hex2i(int c)
 {
-	if (unlikely((unsigned char)(c -= '0') > 9)) {
-		if (likely((unsigned char)(c -= 'A' - '0') > 5 &&
-			      (unsigned char)(c -= 'a' - 'A') > 5))
+	if ((unsigned char)(c -= '0') > 9) {
+		if ((unsigned char)(c -= 'A' - '0') > 5 &&
+			      (unsigned char)(c -= 'a' - 'A') > 5)
 			c = -11;
 		c += 10;
 	}