diff --git a/lib/intel_iosf.c b/lib/intel_iosf.c
index 0ab14df0..26ca7d02 100644
--- a/lib/intel_iosf.c
+++ b/lib/intel_iosf.c
@@ -69,7 +69,8 @@ int intel_punit_read(uint8_t addr, uint32_t *val)
 	return vlv_punit_rw(IOSF_PORT_PUNIT, PUNIT_OPCODE_REG_READ, addr, val);
 }
 
-int intel_punit_write(uint8_t addr, uint32_t val)
+static int intel_punit_write(uint8_t addr, uint32_t val) __attribute__ ((unused));
+static int intel_punit_write(uint8_t addr, uint32_t val)
 {
 	return vlv_punit_rw(IOSF_PORT_PUNIT, PUNIT_OPCODE_REG_WRITE, addr, &val);
 }
@@ -79,7 +80,8 @@ int intel_nc_read(uint8_t addr, uint32_t *val)
 	return vlv_punit_rw(IOSF_PORT_NC, PUNIT_OPCODE_REG_READ, addr, val);
 }
 
-int intel_nc_write(uint8_t addr, uint32_t val)
+static int intel_nc_write(uint8_t addr, uint32_t val) __attribute__ ((unused));
+static int intel_nc_write(uint8_t addr, uint32_t val)
 {
 	return vlv_punit_rw(IOSF_PORT_NC, PUNIT_OPCODE_REG_WRITE, addr, &val);
 }
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index c11b85d7..f9e13f61 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -221,21 +221,20 @@ done:
 	mmio_data.inited++;
 	return 0;
 }
+static int
+intel_register_access_needs_wake(void)
+{
+	return mmio_data.key != FAKEKEY;
+}
 
 void
 intel_register_access_fini(void)
 {
-	if (mmio_data.key && mmio_data.key != FAKEKEY)
+	if (mmio_data.key && intel_register_access_needs_wake())
 		release_forcewake_lock(mmio_data.key);
 	mmio_data.inited--;
 }
 
-int
-intel_register_access_needs_wake(void)
-{
-	return mmio_data.key == FAKEKEY;
-}
-
 uint32_t
 intel_register_read(uint32_t reg)
 {