Merge tag 'v5.15-rc3' into spi-5.15

Linux 5.15-rc3

diff --combined drivers/spi/spi-tegra20-slink.c
index 3226c4e1c7c0dd29e6a7f3e36db18f4cd401b9a8,8ce840c7ecc82c7be7bb88fd2d7198f7bee200cb..713292b0c71ea74889882375e7eff373dffb353b
--- 1/drivers/spi/spi-tegra20-slink.c
--- 2/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@@ -1182,7 -1182,8 +1182,7 @@@ static int tegra_slink_resume(struct de
  }
  #endif
  
 -#ifdef CONFIG_PM
 -static int tegra_slink_runtime_suspend(struct device *dev)
 +static int __maybe_unused tegra_slink_runtime_suspend(struct device *dev)
  {
        struct spi_master *master = dev_get_drvdata(dev);
        struct tegra_slink_data *tspi = spi_master_get_devdata(master);
@@@ -1194,7 -1195,7 +1194,7 @@@
        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);
@@@ -1207,6 -1208,7 +1207,6 @@@
        }
        return 0;
  }
 -#endif /* CONFIG_PM */
  
  static const struct dev_pm_ops slink_pm_ops = {
        SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,