Mesa (main): pvr: shorten error to err in label names

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jun 6 16:07:21 UTC 2022


Module: Mesa
Branch: main
Commit: fd0f02ec4e2afb247e00460d74565533de442d91
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd0f02ec4e2afb247e00460d74565533de442d91

Author: Frank Binns <frank.binns at imgtec.com>
Date:   Mon May 30 18:16:46 2022 +0100

pvr: shorten error to err in label names

This is for consistency with the rest of the driver.

Signed-off-by: Frank Binns <frank.binns at imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil at imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16882>

---

 src/imagination/vulkan/winsys/pvr_winsys_helper.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/imagination/vulkan/winsys/pvr_winsys_helper.c b/src/imagination/vulkan/winsys/pvr_winsys_helper.c
index ae94bab2eaf..14eb324985f 100644
--- a/src/imagination/vulkan/winsys/pvr_winsys_helper.c
+++ b/src/imagination/vulkan/winsys/pvr_winsys_helper.c
@@ -385,13 +385,13 @@ pvr_winsys_helper_fill_static_memory(struct pvr_winsys *const ws,
    pds_ptr = ws->ops->buffer_map(pds_vma->bo);
    if (!pds_ptr) {
       result = VK_ERROR_MEMORY_MAP_FAILED;
-      goto error_pvr_srv_winsys_buffer_unmap_general;
+      goto err_pvr_srv_winsys_buffer_unmap_general;
    }
 
    usc_ptr = ws->ops->buffer_map(usc_vma->bo);
    if (!usc_ptr) {
       result = VK_ERROR_MEMORY_MAP_FAILED;
-      goto error_pvr_srv_winsys_buffer_unmap_pds;
+      goto err_pvr_srv_winsys_buffer_unmap_pds;
    }
 
    pvr_setup_static_vdm_sync(pds_ptr,
@@ -410,10 +410,10 @@ pvr_winsys_helper_fill_static_memory(struct pvr_winsys *const ws,
 
    return VK_SUCCESS;
 
-error_pvr_srv_winsys_buffer_unmap_pds:
+err_pvr_srv_winsys_buffer_unmap_pds:
    ws->ops->buffer_unmap(pds_vma->bo);
 
-error_pvr_srv_winsys_buffer_unmap_general:
+err_pvr_srv_winsys_buffer_unmap_general:
    ws->ops->buffer_unmap(general_vma->bo);
 
    return result;



More information about the mesa-commit mailing list