diff --git a/src/drivers/intel/gma/acpi/configure_brightness_levels.asl b/src/drivers/intel/gma/acpi/configure_brightness_levels.asl
index c1f11047b8..342f760f82 100644
--- a/src/drivers/intel/gma/acpi/configure_brightness_levels.asl
+++ b/src/drivers/intel/gma/acpi/configure_brightness_levels.asl
@@ -76,7 +76,7 @@
 				Sleep (1)
 				If (And (ASLC, 0x2) == 0) {
 					/* Request has been processed, check status: */
-					And (ShiftRight (ASLC, 12), 0x3, Local1)
+					And (ASLC >> 12, 0x3, Local1)
 					If (Local1 == 0) {
 						Return (Zero)
 					} Else {
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl
index 6fdcb85898..941e02b190 100644
--- a/src/superio/acpi/pnp.asl
+++ b/src/superio/acpi/pnp.asl
@@ -117,7 +117,7 @@
 #define PNP_WRITE_IO(IO_TO, RESOURCE, IO_TAG) \
 	CreateWordField (RESOURCE, IO_TAG._MIN, IO_TAG##I)\
 	Store (And(IO_TAG##I, 0xff), IO_TO##_LOW_BYTE)\
-	Store (ShiftRight(IO_TAG##I, 8), IO_TO##_HIGH_BYTE)
+	Store (IO_TAG##I >> 8, IO_TO##_HIGH_BYTE)
 
 #define PNP_WRITE_IRQ(IRQ_TO, RESOURCE, IRQ_TAG) \
 	CreateWordField (RESOURCE, IRQ_TAG._INT, IRQ_TAG##W)\