diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-27 18:38:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-27 18:38:10 +0100 |
| commit | 59c4e190b10cd2d6edccb5c238a3d2bda071a018 (patch) | |
| tree | 394e0d2a793ada03c280e066cd34f9ce7bf6633a /drivers/spi | |
| parent | 6840615f85f6046039ebc4989870ddb12892b7fc (diff) | |
| parent | 5816b3e6577eaa676ceb00a848f0fd65fe2adc29 (diff) | |
| download | linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.tar.bz2 | |
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 3226c4e1c7c0..713292b0c71e 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -1194,7 +1194,7 @@ static int __maybe_unused tegra_slink_runtime_suspend(struct device *dev) return 0; } -static int __maybe_unused tegra_slink_runtime_resume(struct device *dev) +static int tegra_slink_runtime_resume(struct device *dev) { struct spi_master *master = dev_get_drvdata(dev); struct tegra_slink_data *tspi = spi_master_get_devdata(master); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 57e2499ec1ed..aea037c65985 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -58,10 +58,6 @@ modalias_show(struct device *dev, struct device_attribute *a, char *buf) const struct spi_device *spi = to_spi_device(dev); int len; - len = of_device_modalias(dev, buf, PAGE_SIZE); - if (len != -ENODEV) - return len; - len = acpi_device_modalias(dev, buf, PAGE_SIZE - 1); if (len != -ENODEV) return len; @@ -367,10 +363,6 @@ static int spi_uevent(struct device *dev, struct kobj_uevent_env *env) const struct spi_device *spi = to_spi_device(dev); int rc; - rc = of_device_uevent_modalias(dev, env); - if (rc != -ENODEV) - return rc; - rc = acpi_device_uevent_modalias(dev, env); if (rc != -ENODEV) return rc; |