Skip to content

Commit ac8a6eb

Browse files
committed
spi: Fix tegra20 build with CONFIG_PM=n once again
Commit efafec2 ("spi: Fix tegra20 build with CONFIG_PM=n") already fixed the build without PM support once. There was an alternative fix by Guenter in commit 2bab940 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally"), and Mark then merged the two correctly in ffb1e76 ("Merge tag 'v5.15-rc2' into spi-5.15"). But for some inexplicable reason, Mark then merged things _again_ in commit 59c4e19 ("Merge tag 'v5.15-rc3' into spi-5.15"), and screwed things up at that point, and the __maybe_unused attribute on tegra_slink_runtime_resume() went missing. Reinstate it, so that alpha (and other architectures without PM support) builds cleanly again. Btw, this is another prime example of how random back-merges are not good. Just don't do them. Subsystem developers should not merge my tree in any normal circumstances. Both of those merge commits pointed to above are bad: even the one that got the merge result right doesn't even mention _why_ it was done, and the one that got it wrong is obviously broken. Reported-by: Guenter Roeck <[email protected]> Cc: Mark Brown <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent c2b4385 commit ac8a6eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/spi/spi-tegra20-slink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ static int __maybe_unused tegra_slink_runtime_suspend(struct device *dev)
11941194
return 0;
11951195
}
11961196

1197-
static int tegra_slink_runtime_resume(struct device *dev)
1197+
static int __maybe_unused tegra_slink_runtime_resume(struct device *dev)
11981198
{
11991199
struct spi_master *master = dev_get_drvdata(dev);
12001200
struct tegra_slink_data *tspi = spi_master_get_devdata(master);

0 commit comments

Comments
 (0)