OSDN Git Service

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

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

index 3f8c834..e69cb28 100644 (file)
 struct fd_pipe *
 fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
 {
-       struct fd_pipe *pipe = NULL;
+       struct fd_pipe *pipe;
        uint64_t val;
 
        if (id > FD_PIPE_MAX) {
                ERROR_MSG("invalid pipe id: %d", id);
-               goto fail;
+               return NULL;
        }
 
        pipe = dev->funcs->pipe_new(dev, id);
        if (!pipe) {
                ERROR_MSG("allocation failed");
-               goto fail;
+               return NULL;
        }
 
        pipe->dev = dev;
@@ -57,10 +57,6 @@ fd_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
        pipe->gpu_id = val;
 
        return pipe;
-fail:
-       if (pipe)
-               fd_pipe_del(pipe);
-       return NULL;
 }
 
 void fd_pipe_del(struct fd_pipe *pipe)