From: Jarkko Sakkinen <jarkko@kernel.org>
To: Li Jun <lijun01@kylinos.cn>
Cc: peterhuewe@gmx.de, jgg@ziepe.ca, linux-integrity@vger.kernel.org
Subject: Re: [PATCH v2] tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr()
Date: Thu, 10 Sep 2026 01:56:37 +0300 [thread overview]
Message-ID: <aqHkJaAwHvSJdYkN@kernel.org> (raw)
In-Reply-To: <20260909082459.796628-1-lijun01@kylinos.cn>
On Wed, Sep 09, 2026 at 04:24:59PM +0800, Li Jun wrote:
> Replace the deprecated SIMPLE_DEV_PM_OPS with DEFINE_SIMPLE_DEV_PM_OPS
> and wrap the struct assignment with pm_sleep_ptr(). The old code keeps
> a completely empty dev_pm_ops structure -- all callbacks are NULL --
> as dead code in the object file when CONFIG_PM_SLEEP=n, because
> SET_SYSTEM_SLEEP_PM_OPS() expands to nothing while __maybe_unused on
> the struct only silences the warning without removing the struct.
> Switching to DEFINE_SIMPLE_DEV_PM_OPS() lets pm_sleep_ptr() eliminate
> the callback references at compile time, and wrapping the struct
> assignment with pm_sleep_ptr() drops the entire structure when
> CONFIG_PM_SLEEP is disabled, instead of retaining an empty one.
>
> Signed-off-by: Li Jun <lijun01@kylinos.cn>
> ---
> Changes:
> -Modify all of them in drivers/char/tpm/*.c.
> ---
> drivers/char/tpm/tpm_atmel.c | 4 ++--
> drivers/char/tpm/tpm_i2c_atmel.c | 4 ++--
> drivers/char/tpm/tpm_i2c_infineon.c | 4 ++--
> drivers/char/tpm/tpm_i2c_nuvoton.c | 4 ++--
> drivers/char/tpm/tpm_infineon.c | 4 ++--
> drivers/char/tpm/tpm_nsc.c | 4 ++--
> drivers/char/tpm/tpm_tis.c | 4 ++--
> drivers/char/tpm/tpm_tis_i2c.c | 4 ++--
> drivers/char/tpm/tpm_tis_i2c_cr50.c | 4 ++--
> drivers/char/tpm/tpm_tis_spi_main.c | 4 ++--
> drivers/char/tpm/tpm_tis_synquacer.c | 4 ++--
> 11 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
> index f25faf468bba..2c3f6bdd7873 100644
> --- a/drivers/char/tpm/tpm_atmel.c
> +++ b/drivers/char/tpm/tpm_atmel.c
> @@ -205,12 +205,12 @@ static void atml_plat_remove(void)
> platform_device_unregister(pdev);
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume);
>
> static struct platform_driver atml_drv = {
> .driver = {
> .name = "tpm_atmel",
> - .pm = &tpm_atml_pm,
> + .pm = pm_sleep_ptr(&tpm_atml_pm),
> },
> };
>
> diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
> index 9fd73049821f..dcb91d0497d0 100644
> --- a/drivers/char/tpm/tpm_i2c_atmel.c
> +++ b/drivers/char/tpm/tpm_i2c_atmel.c
> @@ -212,7 +212,7 @@ static const struct of_device_id i2c_atmel_of_match[] = {
> MODULE_DEVICE_TABLE(of, i2c_atmel_of_match);
> #endif
>
> -static SIMPLE_DEV_PM_OPS(i2c_atmel_pm_ops, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(i2c_atmel_pm_ops, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver i2c_atmel_driver = {
> .id_table = i2c_atmel_id,
> @@ -220,7 +220,7 @@ static struct i2c_driver i2c_atmel_driver = {
> .remove = i2c_atmel_remove,
> .driver = {
> .name = I2C_DRIVER_NAME,
> - .pm = &i2c_atmel_pm_ops,
> + .pm = pm_sleep_ptr(&i2c_atmel_pm_ops),
> .of_match_table = of_match_ptr(i2c_atmel_of_match),
> },
> };
> diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
> index 8b7d32de0b2e..fffa235068df 100644
> --- a/drivers/char/tpm/tpm_i2c_infineon.c
> +++ b/drivers/char/tpm/tpm_i2c_infineon.c
> @@ -682,7 +682,7 @@ static const struct of_device_id tpm_tis_i2c_of_match[] = {
> MODULE_DEVICE_TABLE(of, tpm_tis_i2c_of_match);
> #endif
>
> -static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);
>
> static int tpm_tis_i2c_probe(struct i2c_client *client)
> {
> @@ -723,7 +723,7 @@ static struct i2c_driver tpm_tis_i2c_driver = {
> .remove = tpm_tis_i2c_remove,
> .driver = {
> .name = "tpm_i2c_infineon",
> - .pm = &tpm_tis_i2c_ops,
> + .pm = pm_sleep_ptr(&tpm_tis_i2c_ops),
> .of_match_table = of_match_ptr(tpm_tis_i2c_of_match),
> },
> };
> diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
> index c84afb29d548..387661380913 100644
> --- a/drivers/char/tpm/tpm_i2c_nuvoton.c
> +++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
> @@ -640,7 +640,7 @@ static const struct of_device_id i2c_nuvoton_of_match[] = {
> MODULE_DEVICE_TABLE(of, i2c_nuvoton_of_match);
> #endif
>
> -static SIMPLE_DEV_PM_OPS(i2c_nuvoton_pm_ops, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(i2c_nuvoton_pm_ops, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver i2c_nuvoton_driver = {
> .id_table = i2c_nuvoton_id,
> @@ -648,7 +648,7 @@ static struct i2c_driver i2c_nuvoton_driver = {
> .remove = i2c_nuvoton_remove,
> .driver = {
> .name = "tpm_i2c_nuvoton",
> - .pm = &i2c_nuvoton_pm_ops,
> + .pm = pm_sleep_ptr(&i2c_nuvoton_pm_ops),
> .of_match_table = of_match_ptr(i2c_nuvoton_of_match),
> },
> };
> diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
> index 7638b65b851b..84a0d3e5f679 100644
> --- a/drivers/char/tpm/tpm_infineon.c
> +++ b/drivers/char/tpm/tpm_infineon.c
> @@ -612,7 +612,7 @@ static int tpm_inf_resume(struct device *dev)
> return tpm_pm_resume(dev);
> }
> #endif
> -static SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_inf_pm, tpm_pm_suspend, tpm_inf_resume);
>
> static struct pnp_driver tpm_inf_pnp_driver = {
> .name = "tpm_inf_pnp",
> @@ -620,7 +620,7 @@ static struct pnp_driver tpm_inf_pnp_driver = {
> .probe = tpm_inf_pnp_probe,
> .remove = tpm_inf_pnp_remove,
> .driver = {
> - .pm = &tpm_inf_pm,
> + .pm = pm_sleep_ptr(&tpm_inf_pm),
> }
> };
>
> diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
> index 879ac88f5783..764038ba82a9 100644
> --- a/drivers/char/tpm/tpm_nsc.c
> +++ b/drivers/char/tpm/tpm_nsc.c
> @@ -265,12 +265,12 @@ static void tpm_nsc_remove(struct device *dev)
> release_region(priv->base, 2);
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_nsc_pm, tpm_pm_suspend, tpm_pm_resume);
>
> static struct platform_driver nsc_drv = {
> .driver = {
> .name = "tpm_nsc",
> - .pm = &tpm_nsc_pm,
> + .pm = pm_sleep_ptr(&tpm_nsc_pm),
> },
> };
>
> diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
> index 9aa230a63616..737d0fe4bb61 100644
> --- a/drivers/char/tpm/tpm_tis.c
> +++ b/drivers/char/tpm/tpm_tis.c
> @@ -246,7 +246,7 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info)
> ACPI_HANDLE(dev));
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
>
> static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
> const struct pnp_device_id *pnp_id)
> @@ -302,7 +302,7 @@ static struct pnp_driver tis_pnp_driver = {
> .probe = tpm_tis_pnp_init,
> .remove = tpm_tis_pnp_remove,
> .driver = {
> - .pm = &tpm_tis_pm,
> + .pm = pm_sleep_ptr(&tpm_tis_pm),
> },
> };
>
> diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c
> index 6cd07dd34507..d55f30fef00a 100644
> --- a/drivers/char/tpm/tpm_tis_i2c.c
> +++ b/drivers/char/tpm/tpm_tis_i2c.c
> @@ -319,7 +319,7 @@ static int tpm_tis_i2c_init_guard_time(struct tpm_tis_i2c_phy *phy)
> return 0;
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
>
> static const struct tpm_tis_phy_ops tpm_i2c_phy_ops = {
> .read_bytes = tpm_tis_i2c_read_bytes,
> @@ -393,7 +393,7 @@ MODULE_DEVICE_TABLE(of, of_tis_i2c_match);
> static struct i2c_driver tpm_tis_i2c_driver = {
> .driver = {
> .name = "tpm_tis_i2c",
> - .pm = &tpm_tis_pm,
> + .pm = pm_sleep_ptr(&tpm_tis_pm),
> .of_match_table = of_match_ptr(of_tis_i2c_match),
> },
> .probe = tpm_tis_i2c_probe,
> diff --git a/drivers/char/tpm/tpm_tis_i2c_cr50.c b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> index 7f828fae70d3..6c0ea5ca2b92 100644
> --- a/drivers/char/tpm/tpm_tis_i2c_cr50.c
> +++ b/drivers/char/tpm/tpm_tis_i2c_cr50.c
> @@ -816,14 +816,14 @@ static void tpm_cr50_i2c_remove(struct i2c_client *client)
> tpm_chip_unregister(chip);
> }
>
> -static SIMPLE_DEV_PM_OPS(cr50_i2c_pm, tpm_pm_suspend, tpm_pm_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(cr50_i2c_pm, tpm_pm_suspend, tpm_pm_resume);
>
> static struct i2c_driver cr50_i2c_driver = {
> .probe = tpm_cr50_i2c_probe,
> .remove = tpm_cr50_i2c_remove,
> .driver = {
> .name = "cr50_i2c",
> - .pm = &cr50_i2c_pm,
> + .pm = pm_sleep_ptr(&cr50_i2c_pm),
> .acpi_match_table = ACPI_PTR(cr50_i2c_acpi_id),
> .of_match_table = of_match_ptr(of_cr50_i2c_match),
> },
> diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
> index 61b42c83ced8..727f1c78d6dd 100644
> --- a/drivers/char/tpm/tpm_tis_spi_main.c
> +++ b/drivers/char/tpm/tpm_tis_spi_main.c
> @@ -307,7 +307,7 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi)
> return probe_func(spi);
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume);
>
> static void tpm_tis_spi_remove(struct spi_device *dev)
> {
> @@ -347,7 +347,7 @@ MODULE_DEVICE_TABLE(acpi, acpi_tis_spi_match);
> static struct spi_driver tpm_tis_spi_driver = {
> .driver = {
> .name = "tpm_tis_spi",
> - .pm = &tpm_tis_pm,
> + .pm = pm_sleep_ptr(&tpm_tis_pm),
> .of_match_table = of_match_ptr(of_tis_spi_match),
> .acpi_match_table = ACPI_PTR(acpi_tis_spi_match),
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> diff --git a/drivers/char/tpm/tpm_tis_synquacer.c b/drivers/char/tpm/tpm_tis_synquacer.c
> index 4927714d277a..eac39730a856 100644
> --- a/drivers/char/tpm/tpm_tis_synquacer.c
> +++ b/drivers/char/tpm/tpm_tis_synquacer.c
> @@ -107,7 +107,7 @@ static int tpm_tis_synquacer_init(struct device *dev,
> ACPI_HANDLE(dev));
> }
>
> -static SIMPLE_DEV_PM_OPS(tpm_tis_synquacer_pm, tpm_pm_suspend, tpm_tis_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(tpm_tis_synquacer_pm, tpm_pm_suspend, tpm_tis_resume);
>
> static int tpm_tis_synquacer_probe(struct platform_device *pdev)
> {
> @@ -155,7 +155,7 @@ static struct platform_driver tis_synquacer_drv = {
> .remove = tpm_tis_synquacer_remove,
> .driver = {
> .name = "tpm_tis_synquacer",
> - .pm = &tpm_tis_synquacer_pm,
> + .pm = pm_sleep_ptr(&tpm_tis_synquacer_pm),
> .of_match_table = of_match_ptr(tis_synquacer_of_platform_match),
> .acpi_match_table = ACPI_PTR(tpm_synquacer_acpi_tbl),
> },
> --
> 2.25.1
>
I pressed g on wrong email in mutt was meant for this:
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
BR, Jarkko
prev parent reply other threads:[~2026-09-09 22:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-09 8:24 [PATCH v2] tpm: use DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr() Li Jun
2026-09-09 22:56 ` Jarkko Sakkinen [this message]
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=aqHkJaAwHvSJdYkN@kernel.org \
--to=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=lijun01@kylinos.cn \
--cc=linux-integrity@vger.kernel.org \
--cc=peterhuewe@gmx.de \
/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