diff --git a/src/panfrost/vulkan/panvk_shader.h b/src/panfrost/vulkan/panvk_shader.h
index eff0799f4ea..7ab9a4e9465 100644
--- a/src/panfrost/vulkan/panvk_shader.h
+++ b/src/panfrost/vulkan/panvk_shader.h
@@ -191,7 +191,7 @@ panvk_shader_link_cleanup(struct panvk_shader_link *link)
 }
 #endif
 
-bool panvk_per_arch(nir_lower_descriptors)(
+void panvk_per_arch(nir_lower_descriptors)(
    nir_shader *nir, struct panvk_device *dev,
    const struct vk_pipeline_robustness_state *rs, uint32_t set_layout_count,
    struct vk_descriptor_set_layout *const *set_layouts,
diff --git a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
index 755621c2208..f21c430b13c 100644
--- a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
+++ b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c
@@ -1198,7 +1198,7 @@ upload_shader_desc_info(struct panvk_device *dev, struct panvk_shader *shader,
    shader->desc_info.used_set_mask = desc_info->used_set_mask;
 }
 
-bool
+void
 panvk_per_arch(nir_lower_descriptors)(
    nir_shader *nir, struct panvk_device *dev,
    const struct vk_pipeline_robustness_state *rs, uint32_t set_layout_count,
@@ -1234,18 +1234,17 @@ panvk_per_arch(nir_lower_descriptors)(
    for (uint32_t i = 0; i < set_layout_count; i++)
       ctx.set_layouts[i] = to_panvk_descriptor_set_layout(set_layouts[i]);
 
-   progress = nir_shader_instructions_pass(nir, collect_instr_desc_access,
-                                           nir_metadata_all, &ctx);
+   NIR_PASS(progress, nir, nir_shader_instructions_pass,
+            collect_instr_desc_access, nir_metadata_all, &ctx);
    if (!progress)
       goto out;
 
    create_copy_table(nir, &ctx);
    upload_shader_desc_info(dev, shader, &ctx.desc_info);
 
-   progress = nir_shader_instructions_pass(nir, lower_descriptors_instr,
-                                           nir_metadata_control_flow, &ctx);
+   NIR_PASS(progress, nir, nir_shader_instructions_pass,
+            lower_descriptors_instr, nir_metadata_control_flow, &ctx);
 
 out:
    _mesa_hash_table_destroy(ctx.ht, NULL);
-   return progress;
 }
diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c
index ac5e343d45e..3596f2c2785 100644
--- a/src/panfrost/vulkan/panvk_vX_shader.c
+++ b/src/panfrost/vulkan/panvk_vX_shader.c
@@ -515,8 +515,8 @@ panvk_lower_nir(struct panvk_device *dev, nir_shader *nir,
    }
 #endif
 
-   NIR_PASS(_, nir, panvk_per_arch(nir_lower_descriptors), dev, rs,
-            set_layout_count, set_layouts, shader);
+   panvk_per_arch(nir_lower_descriptors)(nir, dev, rs, set_layout_count,
+                                         set_layouts, shader);
 
    NIR_PASS(_, nir, nir_split_var_copies);
    NIR_PASS(_, nir, nir_lower_var_copies);