diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index 279f8a1a0a..4ab45bcc09 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -40,7 +40,7 @@ static int codec_detect(u8 *base)
 	int count;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* clear STATESTS bits (BAR + 0xe)[2:0] */
@@ -62,11 +62,11 @@ static int codec_detect(u8 *base)
 		goto no_codec;
 
 	/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
 		goto no_codec;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Read in Codec location (BAR + 0xe)[2..0] */
@@ -166,7 +166,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "azalia_audio: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -174,7 +174,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -192,12 +192,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "azalia_audio: verb loaded.\n");
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 15be4abaef..b91151aee4 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -46,7 +46,7 @@ static int codec_detect(u8 *base)
 	u8 reg8;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Write back the value once reset bit is set. */
@@ -142,7 +142,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -150,7 +150,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -168,12 +168,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@@ -188,12 +188,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
 	}
 
 	for (i = 0; i < pc_beep_verbs_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, pc_beep_verbs[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 }
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index 99582b41d6..6cf1fea165 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
 	u32 reg32;
 
 	/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
 		goto no_codec;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Read in Codec location (BAR + 0xe)[2..0] */
@@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c
index 1d1405ea46..0e0ccd6b1a 100644
--- a/src/southbridge/intel/i82801ix/azalia.c
+++ b/src/southbridge/intel/i82801ix/azalia.c
@@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
 	u32 reg32;
 
 	/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
 		goto no_codec;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Read in Codec location (BAR + 0xe)[2..0] */
@@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@@ -187,12 +187,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
 	}
 
 	for (i = 0; i < pc_beep_verbs_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, pc_beep_verbs[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 }
diff --git a/src/southbridge/intel/i82801jx/azalia.c b/src/southbridge/intel/i82801jx/azalia.c
index 3fa344dd38..3b2289ed91 100644
--- a/src/southbridge/intel/i82801jx/azalia.c
+++ b/src/southbridge/intel/i82801jx/azalia.c
@@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
 	u32 reg32;
 
 	/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
 		goto no_codec;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Read in Codec location (BAR + 0xe)[2..0] */
@@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@@ -187,12 +187,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
 	}
 
 	for (i = 0; i < pc_beep_verbs_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, pc_beep_verbs[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 }
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 011bde60b1..c947092f18 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -42,7 +42,7 @@ static int codec_detect(u8 *base)
 	u8 reg8;
 
 	/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
-	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
+	if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
 		goto no_codec;
 
 	/* Write back the value once reset bit is set. */
@@ -138,7 +138,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
 
 	/* 1 */
-	if (wait_for_ready(base) == -1) {
+	if (wait_for_ready(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not ready.\n");
 		return;
 	}
@@ -146,7 +146,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 	reg32 = (addr << 28) | 0x000f0000;
 	write32(base + HDA_IC_REG, reg32);
 
-	if (wait_for_valid(base) == -1) {
+	if (wait_for_valid(base) < 0) {
 		printk(BIOS_DEBUG, "  codec not valid.\n");
 		return;
 	}
@@ -164,12 +164,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
 
 	/* 3 */
 	for (i = 0; i < verb_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, verb[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 	printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@@ -185,12 +185,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
 	}
 
 	for (i = 0; i < pc_beep_verbs_size; i++) {
-		if (wait_for_ready(base) == -1)
+		if (wait_for_ready(base) < 0)
 			return;
 
 		write32(base + HDA_IC_REG, pc_beep_verbs[i]);
 
-		if (wait_for_valid(base) == -1)
+		if (wait_for_valid(base) < 0)
 			return;
 	}
 }