Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge existing fixes from spi/for-5.15

+8 -3
+6
drivers/spi/spi-rockchip.c
··· 600 600 int ret; 601 601 bool use_dma; 602 602 603 + /* Zero length transfers won't trigger an interrupt on completion */ 604 + if (!xfer->len) { 605 + spi_finalize_current_transfer(ctlr); 606 + return 1; 607 + } 608 + 603 609 WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && 604 610 (readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY)); 605 611
+2 -3
drivers/spi/spi-tegra20-slink.c
··· 204 204 struct dma_async_tx_descriptor *tx_dma_desc; 205 205 }; 206 206 207 - static int tegra_slink_runtime_suspend(struct device *dev); 208 - static int tegra_slink_runtime_resume(struct device *dev); 209 - 210 207 static inline u32 tegra_slink_readl(struct tegra_slink_data *tspi, 211 208 unsigned long reg) 212 209 { ··· 1182 1185 } 1183 1186 #endif 1184 1187 1188 + #ifdef CONFIG_PM 1185 1189 static int tegra_slink_runtime_suspend(struct device *dev) 1186 1190 { 1187 1191 struct spi_master *master = dev_get_drvdata(dev); ··· 1208 1210 } 1209 1211 return 0; 1210 1212 } 1213 + #endif /* CONFIG_PM */ 1211 1214 1212 1215 static const struct dev_pm_ops slink_pm_ops = { 1213 1216 SET_RUNTIME_PM_OPS(tegra_slink_runtime_suspend,