aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-19 08:44:15 -0500
committerPeter Huewe <peterhuewe@gmx.de>2015-01-17 08:00:06 -0500
commit2dfc2deda2c9b1def7dc9399623479b69cd9f7ff (patch)
treeb89d2c18beb54fdaec212e1f4d76d8e517f41c85 /drivers/char
parent9fd8e5a25ecb0febfad321c04478a9d8b8b247f7 (diff)
char: tpm: Deletion of unnecessary checks before the function call "tpm_dev_vendor_release"
The tpm_dev_vendor_release() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_i2c_atmel.c3
-rw-r--r--drivers/char/tpm/tpm_i2c_nuvoton.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_i2c_atmel.c b/drivers/char/tpm/tpm_i2c_atmel.c
index 503a85ae176c..5f448886417f 100644
--- a/drivers/char/tpm/tpm_i2c_atmel.c
+++ b/drivers/char/tpm/tpm_i2c_atmel.c
@@ -206,8 +206,7 @@ static int i2c_atmel_remove(struct i2c_client *client)
206 struct device *dev = &(client->dev); 206 struct device *dev = &(client->dev);
207 struct tpm_chip *chip = dev_get_drvdata(dev); 207 struct tpm_chip *chip = dev_get_drvdata(dev);
208 208
209 if (chip) 209 tpm_dev_vendor_release(chip);
210 tpm_dev_vendor_release(chip);
211 tpm_remove_hardware(dev); 210 tpm_remove_hardware(dev);
212 kfree(chip); 211 kfree(chip);
213 return 0; 212 return 0;
diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c b/drivers/char/tpm/tpm_i2c_nuvoton.c
index 23c7b137a7fd..bbb4997438c3 100644
--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
+++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
@@ -630,8 +630,7 @@ static int i2c_nuvoton_remove(struct i2c_client *client)
630 struct device *dev = &(client->dev); 630 struct device *dev = &(client->dev);
631 struct tpm_chip *chip = dev_get_drvdata(dev); 631 struct tpm_chip *chip = dev_get_drvdata(dev);
632 632
633 if (chip) 633 tpm_dev_vendor_release(chip);
634 tpm_dev_vendor_release(chip);
635 tpm_remove_hardware(dev); 634 tpm_remove_hardware(dev);
636 kfree(chip); 635 kfree(chip);
637 return 0; 636 return 0;