On Wed, Oct 13, 2021 at 04:45:23PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> 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@xxxxxxxx>
> ---
> 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@xxxxxxxxxxxx>
Guenter
> {
> struct spi_master *master = dev_get_drvdata(dev);
> struct tegra_slink_data *tspi = spi_master_get_devdata(master);
> --
> 2.29.2
>
