Using "goto" in that "switch" statement only makes it harder to follow
control flow and doesn't bring any advantages. Rewrite the code to avoid
using "goto".

Signed-off-by: Andrey Smirnov <[email protected]>
---
 drivers/mtd/nand/nand_base.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 57043a6..8fa5536 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2139,18 +2139,15 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t 
from,
        case MTD_OPS_PLACE_OOB:
        case MTD_OPS_AUTO_OOB:
        case MTD_OPS_RAW:
+               if (!ops->datbuf)
+                       ret = nand_do_read_oob(mtd, from, ops);
+               else
+                       ret = nand_do_read_ops(mtd, from, ops);
                break;
-
        default:
-               goto out;
+               break;
        }
 
-       if (!ops->datbuf)
-               ret = nand_do_read_oob(mtd, from, ops);
-       else
-               ret = nand_do_read_ops(mtd, from, ops);
-
-out:
        nand_release_device(mtd);
        return ret;
 }
-- 
2.5.5

Reply via email to