1. Patchew
  2. linux
  3. View series

[PATCH] tpm: remove extraneous #ifdef

Arnd Bergmann posted 1 patch 1 week, 2 days ago 
drivers/char/tpm/tpm_infineon.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[PATCH] tpm: remove extraneous #ifdef
Posted by Arnd Bergmann 1 week, 2 days ago 
From: Arnd Bergmann <arnd@arndb.de>

Changing to DEFINE_SIMPLE_DEV_PM_OPS() broke here because the
tpm_inf_resume() function is hidden in an #ifdef:

drivers/char/tpm/tpm_infineon.c:615:61: error: 'tpm_inf_resume' undeclared here (not in a function); did you mean 'tpm_pm_resume'?
  615 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
      |                                                             ^~~~~~~~~~~~~~

Remove the #ifdef check.

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_infineon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 84a0d3e5f679..d6edd2ca39a5 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -594,7 +594,6 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev)
 	}
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int tpm_inf_resume(struct device *dev)
 {
 	/* Re-configure TPM after suspending */
@@ -611,7 +610,7 @@ static int tpm_inf_resume(struct device *dev)
 	tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
 	return tpm_pm_resume(dev);
 }
-#endif
+
 static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
 
 static struct pnp_driver tpm_inf_pnp_driver = {
-- 
2.53.0
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Jarkko Sakkinen 1 week ago 
On Tue, Sep 15, 2026 at 10:12:58PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Changing to DEFINE_SIMPLE_DEV_PM_OPS() broke here because the
> tpm_inf_resume() function is hidden in an #ifdef:
> 
> drivers/char/tpm/tpm_infineon.c:615:61: error: 'tpm_inf_resume' undeclared here (not in a function); did you mean 'tpm_pm_resume'?
>   615 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
>       |                                                             ^~~~~~~~~~~~~~
> 
> Remove the #ifdef check.
> 
> 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_infineon.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> index 84a0d3e5f679..d6edd2ca39a5 100644
> --- a/drivers/char/tpm/tpm_infineon.c
> +++ b/drivers/char/tpm/tpm_infineon.c
> @@ -594,7 +594,6 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev)
>  	}
>  }
>  
> -#ifdef CONFIG_PM_SLEEP
>  static int tpm_inf_resume(struct device *dev)
>  {
>  	/* Re-configure TPM after suspending */
> @@ -611,7 +610,7 @@ static int tpm_inf_resume(struct device *dev)
>  	tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
>  	return tpm_pm_resume(dev);
>  }
> -#endif
> +
>  static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
>  
>  static struct pnp_driver tpm_inf_pnp_driver = {
> -- 
> 2.53.0
> 


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

BR, Jarkko
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Jarkko Sakkinen 1 week ago 
On Fri, Sep 18, 2026 at 03:58:11AM +0300, Jarkko Sakkinen wrote:
> On Tue, Sep 15, 2026 at 10:12:58PM +0200, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > Changing to DEFINE_SIMPLE_DEV_PM_OPS() broke here because the
> > tpm_inf_resume() function is hidden in an #ifdef:
> > 
> > drivers/char/tpm/tpm_infineon.c:615:61: error: 'tpm_inf_resume' undeclared here (not in a function); did you mean 'tpm_pm_resume'?
> >   615 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
> >       |                                                             ^~~~~~~~~~~~~~
> > 
> > Remove the #ifdef check.
> > 
> > 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_infineon.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> > index 84a0d3e5f679..d6edd2ca39a5 100644
> > --- a/drivers/char/tpm/tpm_infineon.c
> > +++ b/drivers/char/tpm/tpm_infineon.c
> > @@ -594,7 +594,6 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev)
> >  	}
> >  }
> >  
> > -#ifdef CONFIG_PM_SLEEP
> >  static int tpm_inf_resume(struct device *dev)
> >  {
> >  	/* Re-configure TPM after suspending */
> > @@ -611,7 +610,7 @@ static int tpm_inf_resume(struct device *dev)
> >  	tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
> >  	return tpm_pm_resume(dev);
> >  }
> > -#endif
> > +
> >  static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
> >  
> >  static struct pnp_driver tpm_inf_pnp_driver = {
> > -- 
> > 2.53.0
> > 
> 
> 
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

I pushed this to for-next-tpm, which mirrors to linux-next.

However, since this is -next only bug, I guess I should squash these to
the original commit?

Just sanity checking before taking action :-)

BR, Jarkko
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Arnd Bergmann 1 week ago 
On Fri, Sep 18, 2026, at 03:01, Jarkko Sakkinen wrote:
> On Fri, Sep 18, 2026 at 03:58:11AM +0300, Jarkko Sakkinen wrote:

> I pushed this to for-next-tpm, which mirrors to linux-next.
>
> However, since this is -next only bug, I guess I should squash these to
> the original commit?

Yes, please do, it's just a drive-by patch, which I find easier
to do than reporting it as a bug.

No need for Co-authored-by here either.

    Arnd
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Jarkko Sakkinen 18 hours ago 
On Fri, Sep 18, 2026 at 07:49:12AM +0200, Arnd Bergmann wrote:
> On Fri, Sep 18, 2026, at 03:01, Jarkko Sakkinen wrote:
> > On Fri, Sep 18, 2026 at 03:58:11AM +0300, Jarkko Sakkinen wrote:
> 
> > I pushed this to for-next-tpm, which mirrors to linux-next.
> >
> > However, since this is -next only bug, I guess I should squash these to
> > the original commit?
> 
> Yes, please do, it's just a drive-by patch, which I find easier
> to do than reporting it as a bug.
> 
> No need for Co-authored-by here either.
> 
>     Arnd

Thank you. I've updated my tree accordingly.

BR, Jarkko
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Jarkko Sakkinen 1 week ago 
On Fri, Sep 18, 2026 at 04:01:57AM +0300, Jarkko Sakkinen wrote:
> On Fri, Sep 18, 2026 at 03:58:11AM +0300, Jarkko Sakkinen wrote:
> > On Tue, Sep 15, 2026 at 10:12:58PM +0200, Arnd Bergmann wrote:
> > > From: Arnd Bergmann <arnd@arndb.de>
> > > 
> > > Changing to DEFINE_SIMPLE_DEV_PM_OPS() broke here because the
> > > tpm_inf_resume() function is hidden in an #ifdef:
> > > 
> > > drivers/char/tpm/tpm_infineon.c:615:61: error: 'tpm_inf_resume' undeclared here (not in a function); did you mean 'tpm_pm_resume'?
> > >   615 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
> > >       |                                                             ^~~~~~~~~~~~~~
> > > 
> > > Remove the #ifdef check.
> > > 
> > > 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_infineon.c | 3 +--
> > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> > > index 84a0d3e5f679..d6edd2ca39a5 100644
> > > --- a/drivers/char/tpm/tpm_infineon.c
> > > +++ b/drivers/char/tpm/tpm_infineon.c
> > > @@ -594,7 +594,6 @@ static void tpm_inf_pnp_remove(struct pnp_dev *dev)
> > >  	}
> > >  }
> > >  
> > > -#ifdef CONFIG_PM_SLEEP
> > >  static int tpm_inf_resume(struct device *dev)
> > >  {
> > >  	/* Re-configure TPM after suspending */
> > > @@ -611,7 +610,7 @@ static int tpm_inf_resume(struct device *dev)
> > >  	tpm_data_out(RESET_LP_IRQC_DISABLE, CMD);
> > >  	return tpm_pm_resume(dev);
> > >  }
> > > -#endif
> > > +
> > >  static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
> > >  
> > >  static struct pnp_driver tpm_inf_pnp_driver = {
> > > -- 
> > > 2.53.0
> > > 
> > 
> > 
> > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
> 
> I pushed this to for-next-tpm, which mirrors to linux-next.
> 
> However, since this is -next only bug, I guess I should squash these to
> the original commit?
> 
> Just sanity checking before taking action :-)

My suggestion would be to amend Co-authored-by to the original commit
message as two bug fixes is significant amount of effort to make the
change right.

BR, Jarkko
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Uwe Kleine-König 1 week ago 
Hello Jarkko,

On Fri, Sep 18, 2026 at 04:05:22AM +0300, Jarkko Sakkinen wrote:
> On Fri, Sep 18, 2026 at 04:01:57AM +0300, Jarkko Sakkinen wrote:
> > I pushed this to for-next-tpm, which mirrors to linux-next.

I don't spot it in

https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git for-next-tpm

, do I look at the wrong tree?

> > However, since this is -next only bug, I guess I should squash these to
> > the original commit?
> > 
> > Just sanity checking before taking action :-)
> 
> My suggestion would be to amend Co-authored-by to the original commit
> message as two bug fixes is significant amount of effort to make the
> change right.

I don't care much about my Tested-by: tag, so feel free to drop it.
Promoting that to a Tested-by: on the squashed commit is wrong for sure.

Best regards
Uwe
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Jarkko Sakkinen 18 hours ago 
On Fri, Sep 18, 2026 at 07:44:30AM +0200, Uwe Kleine-König wrote:
> Hello Jarkko,
> 
> On Fri, Sep 18, 2026 at 04:05:22AM +0300, Jarkko Sakkinen wrote:
> > On Fri, Sep 18, 2026 at 04:01:57AM +0300, Jarkko Sakkinen wrote:
> > > I pushed this to for-next-tpm, which mirrors to linux-next.
> 
> I don't spot it in
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git for-next-tpm
> 
> , do I look at the wrong tree?
> 
> > > However, since this is -next only bug, I guess I should squash these to
> > > the original commit?
> > > 
> > > Just sanity checking before taking action :-)
> > 
> > My suggestion would be to amend Co-authored-by to the original commit
> > message as two bug fixes is significant amount of effort to make the
> > change right.
> 
> I don't care much about my Tested-by: tag, so feel free to drop it.
> Promoting that to a Tested-by: on the squashed commit is wrong for sure.
> 
> Best regards
> Uwe

Sorry I had my tree in bad state as per syncing with remotes.

I now squashed fix to the original commit from Li.

Br, Jarkko
Re: [PATCH] tpm: remove extraneous #ifdef
Posted by Uwe Kleine-König 1 week, 1 day ago 
On Tue, Sep 15, 2026 at 10:12:58PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Changing to DEFINE_SIMPLE_DEV_PM_OPS() broke here because the
> tpm_inf_resume() function is hidden in an #ifdef:
> 
> drivers/char/tpm/tpm_infineon.c:615:61: error: 'tpm_inf_resume' undeclared here (not in a function); did you mean 'tpm_pm_resume'?
>   615 | static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
>       |                                                             ^~~~~~~~~~~~~~
> 
> Remove the #ifdef check.
> 
> Fixes: 2249200ee420 ("tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

I hit the same issue during my build tests. Thanks for your patch.

Tested-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>

Best regards
Uwe

Patchew 2.1-devel-ea86937

© 2016 - 2026 Red Hat, Inc.