| Message ID | 20211013144538.2346533-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6b6c496a88e7273a3cc945236b2d39a8f0568a8a |
| Headers | show |
| Series | spi: tegra20: fix build with CONFIG_PM_SLEEP=n | expand |
On Wed, Oct 13, 2021 at 04:45:23PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > There is another one of these warnings: > > drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used [-Werror=unused-function] > 1197 | static int tegra_slink_runtime_resume(struct device *dev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > Give it the same treatment as the other functions in this file. > > Fixes: efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n") > Fixes: 2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/spi/spi-tegra20-slink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c > index 713292b0c71e..33302f6b42d7 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 tegra_slink_runtime_resume(struct device *dev) > +static __maybe_unused int tegra_slink_runtime_resume(struct device *dev) That was actually done in efafec27c565. The error is the result of a bad conflict resolution against 2bab94090b01, not a result of any of the two patches listed in the Fixes: tags. So, yes, either this patch needs to be applied in -next or the conflict resolution needs to be fixed. Reviewed-by: Guenter Roeck <linux@roeck-us.net> Guenter > { > struct spi_master *master = dev_get_drvdata(dev); > struct tegra_slink_data *tspi = spi_master_get_devdata(master); > -- > 2.29.2 >
On Wed, 13 Oct 2021 16:45:23 +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > There is another one of these warnings: > > drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used [-Werror=unused-function] > 1197 | static int tegra_slink_runtime_resume(struct device *dev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: tegra20: fix build with CONFIG_PM_SLEEP=n commit: 7dc9b9562740d858332894447c9779b146559239 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
On Wed, Oct 13, 2021 at 04:45:23PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > There is another one of these warnings: > > drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used [-Werror=unused-function] > 1197 | static int tegra_slink_runtime_resume(struct device *dev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > Give it the same treatment as the other functions in this file. > > Fixes: efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n") > Fixes: 2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/spi/spi-tegra20-slink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Thierry Reding <treding@nvidia.com>
On 10/18/21 6:57 AM, Thierry Reding wrote: > On Wed, Oct 13, 2021 at 04:45:23PM +0200, Arnd Bergmann wrote: >> From: Arnd Bergmann <arnd@arndb.de> >> >> There is another one of these warnings: >> >> drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used [-Werror=unused-function] >> 1197 | static int tegra_slink_runtime_resume(struct device *dev) >> | ^~~~~~~~~~~~~~~~~~~~~~~~~~ >> >> Give it the same treatment as the other functions in this file. >> >> Fixes: efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n") >> Fixes: 2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> drivers/spi/spi-tegra20-slink.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Thierry Reding <treding@nvidia.com> > The problem has now been (re-)introduced into the mainline kernel and causes various test build failures there. Guenter
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 713292b0c71e..33302f6b42d7 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 tegra_slink_runtime_resume(struct device *dev) +static __maybe_unused 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);