Commit 20c07a5b authored by Ezequiel García's avatar Ezequiel García Committed by Brian Norris

mtd: nand: Drop mtd.owner requirement in nand_scan

Since commit 807f16d4 ("mtd: core: set some defaults
when dev.parent is set"), it's now legal for drivers
to call nand_scan and nand_scan_ident without setting
mtd.owner.

Drop the check and while at it remove the BUG() abuse.

Fixes: 807f16d4 ("mtd: core: set some defaults when dev.parent is set")
Signed-off-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
[Brian: editorial note - while commit 807f16d4 wasn't explicitly
    broken, some follow-up commits in the v4.4 release broke a few
    drivers, since they would hit this BUG() if they used nand_scan()
    and were built as modules]
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent f55532a0
...@@ -4009,7 +4009,6 @@ static int nand_dt_init(struct nand_chip *chip) ...@@ -4009,7 +4009,6 @@ static int nand_dt_init(struct nand_chip *chip)
* This is the first phase of the normal nand_scan() function. It reads the * This is the first phase of the normal nand_scan() function. It reads the
* flash ID and sets up MTD fields accordingly. * flash ID and sets up MTD fields accordingly.
* *
* The mtd->owner field must be set to the module of the caller.
*/ */
int nand_scan_ident(struct mtd_info *mtd, int maxchips, int nand_scan_ident(struct mtd_info *mtd, int maxchips,
struct nand_flash_dev *table) struct nand_flash_dev *table)
...@@ -4429,19 +4428,12 @@ EXPORT_SYMBOL(nand_scan_tail); ...@@ -4429,19 +4428,12 @@ EXPORT_SYMBOL(nand_scan_tail);
* *
* This fills out all the uninitialized function pointers with the defaults. * This fills out all the uninitialized function pointers with the defaults.
* The flash ID is read and the mtd/chip structures are filled with the * The flash ID is read and the mtd/chip structures are filled with the
* appropriate values. The mtd->owner field must be set to the module of the * appropriate values.
* caller.
*/ */
int nand_scan(struct mtd_info *mtd, int maxchips) int nand_scan(struct mtd_info *mtd, int maxchips)
{ {
int ret; int ret;
/* Many callers got this wrong, so check for it for a while... */
if (!mtd->owner && caller_is_module()) {
pr_crit("%s called with NULL mtd->owner!\n", __func__);
BUG();
}
ret = nand_scan_ident(mtd, maxchips, NULL); ret = nand_scan_ident(mtd, maxchips, NULL);
if (!ret) if (!ret)
ret = nand_scan_tail(mtd); ret = nand_scan_tail(mtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment