OSDN Git Service

memstick: Remove useless else branch
authorJoey Pabalan <jpabalanb@gmail.com>
Sat, 13 Mar 2021 17:37:40 +0000 (12:37 -0500)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 30 Mar 2021 09:42:04 +0000 (11:42 +0200)
Remove else branch on line 334 of memstick.c, after the return of the
previous branch. Found by checkpatch.

Signed-off-by: Joey Pabalan <jpabalanb@gmail.com>
Link: https://lore.kernel.org/r/20210313173740.GA580681@joeylaptop
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/memstick/core/memstick.c

index 12bc3f5..bb10659 100644 (file)
@@ -331,18 +331,17 @@ static int h_memstick_read_dev_id(struct memstick_dev *card,
                                  sizeof(struct ms_id_register));
                *mrq = &card->current_mrq;
                return 0;
-       } else {
-               if (!(*mrq)->error) {
-                       memcpy(&id_reg, (*mrq)->data, sizeof(id_reg));
-                       card->id.match_flags = MEMSTICK_MATCH_ALL;
-                       card->id.type = id_reg.type;
-                       card->id.category = id_reg.category;
-                       card->id.class = id_reg.class;
-                       dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
-               }
-               complete(&card->mrq_complete);
-               return -EAGAIN;
        }
+       if (!(*mrq)->error) {
+               memcpy(&id_reg, (*mrq)->data, sizeof(id_reg));
+               card->id.match_flags = MEMSTICK_MATCH_ALL;
+               card->id.type = id_reg.type;
+               card->id.category = id_reg.category;
+               card->id.class = id_reg.class;
+               dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
+       }
+       complete(&card->mrq_complete);
+       return -EAGAIN;
 }
 
 static int h_memstick_set_rw_addr(struct memstick_dev *card,