diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-25 13:32:22 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-25 14:34:52 -0700 |
| commit | 22de3ef94bd191537227a7f1bb0908f368601f03 (patch) | |
| tree | b4902bdae78f78b64e13b49d94c16e8fd5b3211a /drivers/spi/spi.c | |
| parent | 1a7b7ee72c218ce9bff274ade13b96ea03eed03d (diff) | |
spi: of: do explicitly request modules for of-registered devices
Trying to register an SPI device asynchronously (via async_schedule() call)
results in an ugly complaint from request_module() warning about potential
deadlock (because request_module tries to wait for async works to
complete, the caller is also an async work in this case).
While we could try to switch to using request_module_nowait(), other buses,
as well as SPI itself when not using device tree, do not try to load
modules explicitly, but rather rely on the standard infrastructure (such as
udev) to execute module loading. There is no reason why SPI OF-described
devices should be treated differently.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4023cc98d808..436ae1b6f6cc 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -16,7 +16,6 @@ */ #include <linux/kernel.h> -#include <linux/kmod.h> #include <linux/device.h> #include <linux/init.h> #include <linux/cache.h> @@ -1359,7 +1358,6 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc) spi->dev.of_node = nc; /* Register the new device */ - request_module("%s%s", SPI_MODULE_PREFIX, spi->modalias); rc = spi_add_device(spi); if (rc) { dev_err(&master->dev, "spi_device register error %s\n", |