tpm: fix build regression for tpm_tis_resume

[PATCH] tpm: fix build regression for tpm_tis_resume

Posted by Arnd Bergmann 1 week, 2 days ago

From: Arnd Bergmann <arnd@arndb.de>

Using DEFINE_SIMPLE_DEV_PM_OPS means that there is no a code reference
to the unused tpm_tis_resume, but that fails here since the declaration
is hidden:

drivers/char/tpm/tpm_tis_i2c.c:322:61: error: 'tpm_tis_resume' undeclared here (not in a function); did you mean 'tpm_tis_remove'?
  322 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
      |                                                             ^~~~~~~~~~~~~~

Remove the incorrect #ifdef.

Fixes: 2249200ee420 ("tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/char/tpm/tpm_tis_core.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index d737b3d67411..741130056876 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -161,8 +161,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 		      const struct tpm_tis_phy_ops *phy_ops,
 		      acpi_handle acpi_dev_handle);
 
-#ifdef CONFIG_PM_SLEEP
 int tpm_tis_resume(struct device *dev);
-#endif
 
 #endif
-- 
2.53.0

Re: [PATCH] tpm: fix build regression for tpm_tis_resume

Posted by Jarkko Sakkinen 1 week ago

On Tue, Sep 15, 2026 at 10:12:29PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Using DEFINE_SIMPLE_DEV_PM_OPS means that there is no a code reference
> to the unused tpm_tis_resume, but that fails here since the declaration
> is hidden:
> 
> drivers/char/tpm/tpm_tis_i2c.c:322:61: error: 'tpm_tis_resume' undeclared here (not in a function); did you mean 'tpm_tis_remove'?
>   322 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
>       |                                                             ^~~~~~~~~~~~~~
> 
> Remove the incorrect #ifdef.
> 
> Fixes: 2249200ee420 ("tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/char/tpm/tpm_tis_core.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
> index d737b3d67411..741130056876 100644
> --- a/drivers/char/tpm/tpm_tis_core.h
> +++ b/drivers/char/tpm/tpm_tis_core.h
> @@ -161,8 +161,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
>  		      const struct tpm_tis_phy_ops *phy_ops,
>  		      acpi_handle acpi_dev_handle);
>  
> -#ifdef CONFIG_PM_SLEEP
>  int tpm_tis_resume(struct device *dev);
> -#endif
>  
>  #endif
> -- 
> 2.53.0
> 

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

Re: [PATCH] tpm: fix build regression for tpm_tis_resume

Posted by Breno Leitao 1 week, 1 day ago

On Tue, Sep 15, 2026 at 10:12:29PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Using DEFINE_SIMPLE_DEV_PM_OPS means that there is no a code reference
> to the unused tpm_tis_resume, but that fails here since the declaration
> is hidden:
> 
> drivers/char/tpm/tpm_tis_i2c.c:322:61: error: 'tpm_tis_resume' undeclared here (not in a function); did you mean 'tpm_tis_remove'?
>   322 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
>       |                                                             ^~~~~~~~~~~~~~
> 
> Remove the incorrect #ifdef.
> 
> Fixes: 2249200ee420 ("tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Tested-by: Breno Leitao <leitao@debian.org>