diff --git a/src/imagination/vulkan/pds/pvr_xgl_pds.c b/src/imagination/vulkan/pds/pvr_xgl_pds.c
index e153712c2c6..0a4850c05cd 100644
--- a/src/imagination/vulkan/pds/pvr_xgl_pds.c
+++ b/src/imagination/vulkan/pds/pvr_xgl_pds.c
@@ -306,7 +306,7 @@ static uint32_t pvr_encode_direct_write(
 static uint32_t
 pvr_find_constant2(uint8_t *const_usage, uint8_t words, const char *const_name)
 {
-   uint32_t const_index = ~0U;
+   uint32_t const_index = ~0;
    uint32_t step = words;
    uint8_t mask = (1 << words) - 1;
 
@@ -325,7 +325,7 @@ pvr_find_constant2(uint8_t *const_usage, uint8_t words, const char *const_name)
    }
 
    unreachable("Unexpected: Space cannot be found for constant");
-   return ~0U;
+   return ~0;
 }
 
 #define PVR_MAX_PDS_TEMPS 32
diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_sync.c b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_sync.c
index ea7dae62c18..b33c0eb78f4 100644
--- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_sync.c
+++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_sync.c
@@ -138,7 +138,7 @@ static VkResult pvr_srv_sync_wait_many(struct vk_device *device,
    if (!poll_fds)
       return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
 
-   if (abs_timeout_ns != 0U && abs_timeout_ns != ~0U) {
+   if (abs_timeout_ns != 0UL && abs_timeout_ns != ~0) {
       /* Syncobj timeouts are signed. */
       abs_timeout_ns = MIN2(abs_timeout_ns, (uint64_t)INT64_MAX);
       pvr_start_timeout(&end_time, abs_timeout_ns);
@@ -172,7 +172,7 @@ static VkResult pvr_srv_sync_wait_many(struct vk_device *device,
 
    /* FIXME: Fix device loss handling. */
    do {
-      if (abs_timeout_ns == ~0U) {
+      if (abs_timeout_ns == ~0) {
          ppoll_ret = ppoll(poll_fds, wait_count, NULL, NULL);
       } else {
          struct timespec remaining_time;