From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933987AbdCVKVf (ORCPT ); Wed, 22 Mar 2017 06:21:35 -0400 Received: from mga05.intel.com ([192.55.52.43]:42833 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933720AbdCVKV3 (ORCPT ); Wed, 22 Mar 2017 06:21:29 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,204,1486454400"; d="scan'208";a="78129147" Date: Wed, 22 Mar 2017 12:21:23 +0200 From: Jarkko Sakkinen To: Arnd Bergmann Cc: Peter Huewe , Marcel Selhorst , Jason Gunthorpe , "Winkler, Tomas" , Jerry Snitselaar , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH] tpm/tpm_crb: mark PM functions as __maybe_unused Message-ID: <20170322102123.7ssqn5v4ulklsg5r@intel.com> References: <20170320091755.1043811-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170320091755.1043811-1-arnd@arndb.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 20, 2017 at 10:17:19AM +0100, Arnd Bergmann wrote: > When CONFIG_PM_SLEEP is disabled, we get a warning about unused functions: > > drivers/char/tpm/tpm_crb.c:551:12: error: 'crb_pm_resume' defined but not used [-Werror=unused-function] > drivers/char/tpm/tpm_crb.c:540:12: error: 'crb_pm_suspend' defined but not used [-Werror=unused-function] > > We could solve this with more sophistated #ifdefs, but a simpler and safer > way is to just mark them as __maybe_unused. > > Fixes: 848efcfb560c ("tpm/tpm_crb: enter the low power state upon device suspend") > Signed-off-by: Arnd Bergmann Hi, I somehow missed this and applied very similar patch. Sorry about that. /Jarkko > --- > drivers/char/tpm/tpm_crb.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c > index 1dfc37e33c02..15f1118982a6 100644 > --- a/drivers/char/tpm/tpm_crb.c > +++ b/drivers/char/tpm/tpm_crb.c > @@ -519,8 +519,7 @@ static int crb_acpi_remove(struct acpi_device *device) > return 0; > } > > -#ifdef CONFIG_PM > -static int crb_pm_runtime_suspend(struct device *dev) > +static __maybe_unused int crb_pm_runtime_suspend(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > @@ -528,7 +527,7 @@ static int crb_pm_runtime_suspend(struct device *dev) > return crb_go_idle(dev, priv); > } > > -static int crb_pm_runtime_resume(struct device *dev) > +static __maybe_unused int crb_pm_runtime_resume(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > @@ -536,7 +535,7 @@ static int crb_pm_runtime_resume(struct device *dev) > return crb_cmd_ready(dev, priv); > } > > -static int crb_pm_suspend(struct device *dev) > +static __maybe_unused int crb_pm_suspend(struct device *dev) > { > int ret; > > @@ -547,7 +546,7 @@ static int crb_pm_suspend(struct device *dev) > return crb_pm_runtime_suspend(dev); > } > > -static int crb_pm_resume(struct device *dev) > +static __maybe_unused int crb_pm_resume(struct device *dev) > { > int ret; > > @@ -558,8 +557,6 @@ static int crb_pm_resume(struct device *dev) > return tpm_pm_resume(dev); > } > > -#endif /* CONFIG_PM */ > - > static const struct dev_pm_ops crb_pm = { > SET_SYSTEM_SLEEP_PM_OPS(crb_pm_suspend, crb_pm_resume) > SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL) > -- > 2.9.0 >