2018-01-02 10:40:11

by Arnd Bergmann

Subject: [PATCH] tpm: remove unused variables

The CLKRUN fix caused a few harmless compile-time warnings:

drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_pnp_remove':
drivers/char/tpm/tpm_tis.c:274:23: error: unused variable 'priv' [-Werror=unused-variable]
drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_plat_remove':
drivers/char/tpm/tpm_tis.c:324:23: error: unused variable 'priv' [-Werror=unused-variable]

This removes the variables that have now become unused.

Fixes: 6d0866cbc2d3 ("tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/char/tpm/tpm_tis.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c847fc69a2fc..1bcbf355141e 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -271,7 +271,6 @@ MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
static void tpm_tis_pnp_remove(struct pnp_dev *dev)
{
struct tpm_chip *chip = pnp_get_drvdata(dev);
- struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);

tpm_chip_unregister(chip);
tpm_tis_remove(chip);
@@ -321,7 +320,6 @@ static int tpm_tis_plat_probe(struct platform_device *pdev)
static int tpm_tis_plat_remove(struct platform_device *pdev)
{
struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
- struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);

tpm_chip_unregister(chip);
tpm_tis_remove(chip);
--
2.9.0

2018-01-02 15:36:52

by Jarkko Sakkinen

Subject: Re: [PATCH] tpm: remove unused variables

On Tue, Jan 02, 2018 at 11:38:54AM +0100, Arnd Bergmann wrote:
> The CLKRUN fix caused a few harmless compile-time warnings:
>
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_pnp_remove':
> drivers/char/tpm/tpm_tis.c:274:23: error: unused variable 'priv' [-Werror=unused-variable]
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_plat_remove':
> drivers/char/tpm/tpm_tis.c:324:23: error: unused variable 'priv' [-Werror=unused-variable]
>
> This removes the variables that have now become unused.
>
> Fixes: 6d0866cbc2d3 ("tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()")
> Signed-off-by: Arnd Bergmann <[email protected]>

Thanks.

Reviewed-by: Jarkko Sakkinen <[email protected]>

/Jarkko

2018-01-07 23:41:36

by James Morris

Subject: Re: [PATCH] tpm: remove unused variables

On Tue, 2 Jan 2018, Arnd Bergmann wrote:

> The CLKRUN fix caused a few harmless compile-time warnings:
>
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_pnp_remove':
> drivers/char/tpm/tpm_tis.c:274:23: error: unused variable 'priv' [-Werror=unused-variable]
> drivers/char/tpm/tpm_tis.c: In function 'tpm_tis_plat_remove':
> drivers/char/tpm/tpm_tis.c:324:23: error: unused variable 'priv' [-Werror=unused-variable]
>
> This removes the variables that have now become unused.
>
> Fixes: 6d0866cbc2d3 ("tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()")
> Signed-off-by: Arnd Bergmann <[email protected]>


Reviewed-by: James Morris <[email protected]>

--
James Morris
<[email protected]>