memstick: Remove useless else branch
Subsystems (2)
PATCH 1/1 memstick: Remove useless else branch
Remove else branch on line 334 of memstick.c, after the return of the previous branch. Found by checkpatch.
Signed-off-by Joey Pabalan <[email protected]>
--- drivers/memstick/core/memstick.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/memstick/core/memstick.c +10 -11
@@ -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,
Signature · 1 line
2.27.0
Quoted 5 lines · Joey Pabalan
Remove else branch on line 334 of
memstick.c, after the return of the previous branch. Found by checkpatch.Signed-off-by Joey Pabalan <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 40 lines
--- drivers/memstick/core/memstick.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)drivers/memstick/core/memstick.c +10
-12@@ -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, --2.27.0