aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo A. R. Silva <garsilva@embeddedor.com>2017-06-13 15:55:42 -0400
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2017-06-18 20:36:04 -0400
commite4b0852798bc15ed1a3ed6768ef2c4d2a1cb7599 (patch)
tree7dd38a3483f17d3b74775ab8d3d219774b8d0726
parent23c3beae581f7cee193c078093a4696040dd380a (diff)
tpm/tpm_atmel: remove unnecessary NULL check
Remove unnecessary NULL check. Pointer _chip_ cannot be NULL in this instance. Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> (compilation) Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-rw-r--r--drivers/char/tpm/tpm_atmel.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 0d322ab11faa..66a14526aaf4 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -144,13 +144,11 @@ static void atml_plat_remove(void)
144 struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); 144 struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
145 struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev); 145 struct tpm_atmel_priv *priv = dev_get_drvdata(&chip->dev);
146 146
147 if (chip) { 147 tpm_chip_unregister(chip);
148 tpm_chip_unregister(chip); 148 if (priv->have_region)
149 if (priv->have_region) 149 atmel_release_region(priv->base, priv->region_size);
150 atmel_release_region(priv->base, priv->region_size); 150 atmel_put_base_addr(priv->iobase);
151 atmel_put_base_addr(priv->iobase); 151 platform_device_unregister(pdev);
152 platform_device_unregister(pdev);
153 }
154} 152}
155 153
156static SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume); 154static SIMPLE_DEV_PM_OPS(tpm_atml_pm, tpm_pm_suspend, tpm_pm_resume);