From: Vignesh Raghavendra Date: Mon, 5 Oct 2020 08:55:10 +0000 (+0530) Subject: Revert "mtd: spi-nor: Prefer asynchronous probe" X-Git-Tag: v5.10-rc1~94^2~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3422a110c868e511387a81df25a315eaa3a7b8;p=thirdparty%2Flinux.git Revert "mtd: spi-nor: Prefer asynchronous probe" This reverts commit 03edda0e1edaa3c2e99239c66e3c14d749318fd6. This leads to warn dump like [1] on some platforms and reorders MTD devices which may break user space expectations [2]. So revert the change. [1]: [ 1.849801] ------------[ cut here ]------------ [ 1.854271] mscc_felix 0000:00:00.5: device is disabled, skipping [ 1.858753] WARNING: CPU: 1 PID: 7 at kernel/kmod.c:136 __request_module+0x3a4/0x568 [...] [2] Bug report: https://lore.kernel.org/linux-mtd/20201003150633.23416-1-michael@walle.cc/ Reported-by: Michael Walle Signed-off-by: Vignesh Raghavendra Reviewed-by: Douglas Anderson Link: https://lore.kernel.org/r/20201005090321.8724-1-vigneshr@ti.com --- diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index 2add4a01fce2d..0369d98b2d12e 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -3451,7 +3451,6 @@ static struct spi_mem_driver spi_nor_driver = { .driver = { .name = "spi-nor", .of_match_table = spi_nor_of_table, - .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, .id_table = spi_nor_dev_ids, },