Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ath79: rb91x_nand: use dev_err_probe

Browse Source 
Simplifies the error path and avoids having to handle -EPROBE_DEFER
manually.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16416
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2024-08-14 19:21:54 -07:00 committed by Hauke Mehrtens
parent 0b6f38c60a
commit 8b8ea076d7
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/ath79/files/drivers/mtd/nand/raw/rb91x_nand.c
View File

@ -284,13 +284,8 @@ static int rb91x_nand_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, drvdata); platform_set_drvdata(pdev, drvdata);
gpios = gpiod_get_array(dev, NULL, GPIOD_OUT_LOW); gpios = gpiod_get_array(dev, NULL, GPIOD_OUT_LOW);
if (IS_ERR(gpios)) { if (IS_ERR(gpios))
if (PTR_ERR(gpios) != -EPROBE_DEFER) { return dev_err_probe(dev, PTR_ERR(gpios), "failed to get gpios");
dev_err(dev, "failed to get gpios: %ld\n",
PTR_ERR(gpios));
}
return PTR_ERR(gpios);
}
if (gpios->ndescs != RB91X_NAND_GPIOS) { if (gpios->ndescs != RB91X_NAND_GPIOS) {
dev_err(dev, "expected %d gpios\n", RB91X_NAND_GPIOS); dev_err(dev, "expected %d gpios\n", RB91X_NAND_GPIOS);
@ -333,16 +328,11 @@ static int rb91x_nand_probe(struct platform_device *pdev)
r = mtd_device_register(mtd, NULL, 0); r = mtd_device_register(mtd, NULL, 0);
if (r) { if (r) {
dev_err(dev, "mtd_device_register() failed: %d\n", rb91x_nand_release(drvdata);
r); return dev_err_probe(dev, r, "mtd_device_register() failed");
goto err_release_nand;
} }
return 0; return 0;
err_release_nand:
rb91x_nand_release(drvdata);
return r;
} }
static int rb91x_nand_remove(struct platform_device *pdev) static int rb91x_nand_remove(struct platform_device *pdev)