| From 68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Tue, 2 Jan 2018 11:38:54 +0100 |
| Subject: tpm: remove unused variables |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit 68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc upstream. |
| |
| 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 <arnd@arndb.de> |
| Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Reviewed-by: James Morris <jmorris@namei.org> |
| Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/char/tpm/tpm_tis.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/char/tpm/tpm_tis.c |
| +++ b/drivers/char/tpm/tpm_tis.c |
| @@ -255,7 +255,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); |
| @@ -305,7 +304,6 @@ static int tpm_tis_plat_probe(struct pla |
| 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); |