From: Guenter Roeck <linux@roeck-us.net>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Laxman Dewangan <ldewangan@nvidia.com>,
Mark Brown <broonie@kernel.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Arnd Bergmann <arnd@arndb.de>, Dmitry Osipenko <digetx@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Zhang Qilong <zhangqilong3@huawei.com>,
Yang Yingliang <yangyingliang@huawei.com>,
linux-spi@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] spi: tegra20: fix build with CONFIG_PM_SLEEP=n
Date: Wed, 13 Oct 2021 08:42:41 -0700 [thread overview]
Message-ID: <20211013154241.GA2356944@roeck-us.net> (raw)
In-Reply-To: <20211013144538.2346533-1-arnd@kernel.org>
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
>
next prev parent reply other threads:[~2021-10-13 15:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 14:45 [PATCH] spi: tegra20: fix build with CONFIG_PM_SLEEP=n Arnd Bergmann
2021-10-13 15:42 ` Guenter Roeck [this message]
2021-10-13 19:59 ` Mark Brown
2021-10-18 13:57 ` Thierry Reding
2021-10-18 14:28 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013154241.GA2356944@roeck-us.net \
--to=linux@roeck-us.net \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=broonie@kernel.org \
--cc=digetx@gmail.com \
--cc=geert+renesas@glider.be \
--cc=jonathanh@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=yangyingliang@huawei.com \
--cc=zhangqilong3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).