From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756864AbdCUIEN (ORCPT ); Tue, 21 Mar 2017 04:04:13 -0400 Received: from mga01.intel.com ([192.55.52.88]:55955 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755141AbdCUIEJ (ORCPT ); Tue, 21 Mar 2017 04:04:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,198,1486454400"; d="scan'208";a="946522958" Date: Tue, 21 Mar 2017 10:03:53 +0200 From: Jarkko Sakkinen To: =?iso-8859-1?B?Suly6W15?= Lefaure Cc: Peter Huewe , Marcel Selhorst , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH] tpm/tpm_crb: fix unused warnings on suspend/resume functions Message-ID: <20170321080353.oh2apppp37nchuw7@intel.com> References: <20170317015133.2269-1-jeremy.lefaure@lse.epita.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170317015133.2269-1-jeremy.lefaure@lse.epita.fr> 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 Thu, Mar 16, 2017 at 09:51:33PM -0400, Jérémy Lefaure wrote: > When PM_SLEEP is disabled crb_pm_suspend and crb_pm_resume are not used by > SET_SYSTEM_SLEEP_PM_OPS even if PM is enabled: > > drvers/char/tpm/tpm_crb.c:540:12: warning: ‘crb_pm_suspend’ defined but not > used [-Wunused-function] > static int crb_pm_suspend(struct device *dev) > ^ > drivers/char/tpm/tpm_crb.c:551:12: warning: ‘crb_pm_resume’ defined but not > used [-Wunused-function] > static int crb_pm_resume(struct device *dev) > ^ > > The preprocessor condition should be on CONFIG_PM_SLEEP, not on CONFIG_PM. > However, this patch fixes this warning by using __maybe_unused on function > that are in the preprocessor condition. > > Signed-off-by: Jérémy Lefaure Thanks. Please include also linux-kernel@vger.kernel.org in the future. Reviewed-by: Jarkko Saskkinen /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 324561845dc2..044afb73fdeb 100644 > --- a/drivers/char/tpm/tpm_crb.c > +++ b/drivers/char/tpm/tpm_crb.c > @@ -520,8 +520,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 int __maybe_unused crb_pm_runtime_suspend(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > @@ -529,7 +528,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 int __maybe_unused crb_pm_runtime_resume(struct device *dev) > { > struct tpm_chip *chip = dev_get_drvdata(dev); > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > @@ -537,7 +536,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 int __maybe_unused crb_pm_suspend(struct device *dev) > { > int ret; > > @@ -548,7 +547,7 @@ static int crb_pm_suspend(struct device *dev) > return crb_pm_runtime_suspend(dev); > } > > -static int crb_pm_resume(struct device *dev) > +static int __maybe_unused crb_pm_resume(struct device *dev) > { > int ret; > > @@ -559,8 +558,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.12.0 >