diff options
author | Mark Brown <broonie@kernel.org> | 2021-09-27 19:38:10 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-09-27 19:38:10 +0200 |
commit | 59c4e190b10cd2d6edccb5c238a3d2bda071a018 (patch) | |
tree | 394e0d2a793ada03c280e066cd34f9ce7bf6633a /drivers/spi/spi-tegra20-slink.c | |
parent | spi: spidev: Add SPI ID table (diff) | |
parent | Linux 5.15-rc3 (diff) | |
download | linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.tar.xz linux-59c4e190b10cd2d6edccb5c238a3d2bda071a018.zip |
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
-rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 2 |
1 files changed, 1 insertions, 1 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); |