| Message ID | 1443782422-4515-2-git-send-email-sr@denx.de |
|---|---|
| State | Accepted |
| Commit | 6efadcf9592c2ed438d1692ca55168e3de5c975b |
| Headers | show |
On Fri, Oct 2, 2015 at 12:40 PM, Stefan Roese <sr@denx.de> wrote: > Remove the BUG macros and return with error (if possible) instead. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Viresh Kumar <viresh.kumar@linaro.org> > Cc: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index dc94882..45948e8 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -348,7 +348,7 @@ static void fsmc_select_chip(struct mtd_info *mtd, int chipnr) break; default: - BUG(); + dev_err(host->dev, "unsupported chip-select %d\n", chipnr); } } @@ -1111,7 +1111,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) default: dev_warn(&pdev->dev, "No oob scheme defined for oobsize %d\n", mtd->oobsize); - BUG(); + ret = -EINVAL; + goto err_probe; } } else { switch (host->mtd.oobsize) { @@ -1127,7 +1128,8 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) default: dev_warn(&pdev->dev, "No oob scheme defined for oobsize %d\n", mtd->oobsize); - BUG(); + ret = -EINVAL; + goto err_probe; } }
Remove the BUG macros and return with error (if possible) instead. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/nand/fsmc_nand.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)