OSDN Git Service

freedreno/msm: remove dead error path
authorEric Engestrom <eric@engestrom.ch>
Sun, 30 Jul 2017 20:27:39 +0000 (21:27 +0100)
committerEric Engestrom <eric.engestrom@imgtec.com>
Mon, 7 Aug 2017 13:16:41 +0000 (14:16 +0100)
`ring` cannot be non-null, so the label reduces to a simple return.
Then, there is no point initialising `ring` just to overwrite it before
anyone reads it.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Rob Clark <robdclark@gmail.com>
freedreno/msm/msm_ringbuffer.c

index c3b2ede..5b28fea 100644 (file)
@@ -589,12 +589,12 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
                uint32_t size)
 {
        struct msm_ringbuffer *msm_ring;
-       struct fd_ringbuffer *ring = NULL;
+       struct fd_ringbuffer *ring;
 
        msm_ring = calloc(1, sizeof(*msm_ring));
        if (!msm_ring) {
                ERROR_MSG("allocation failed");
-               goto fail;
+               return NULL;
        }
 
        if (size == 0) {
@@ -614,8 +614,4 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
        ring_cmd_new(ring, size);
 
        return ring;
-fail:
-       if (ring)
-               fd_ringbuffer_del(ring);
-       return NULL;
 }