]> git.karo-electronics.de Git - linux-beck.git/commitdiff
char: tpm: Deletion of unnecessary checks before the function call "tpm_dev_vendor_re...
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 19 Nov 2014 13:44:15 +0000 (14:44 +0100)
committerPeter Huewe <peterhuewe@gmx.de>
Sat, 17 Jan 2015 13:00:06 +0000 (14:00 +0100)
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>
drivers/char/tpm/tpm_i2c_atmel.c
drivers/char/tpm/tpm_i2c_nuvoton.c

index 503a85ae176cdc74c14b5631a7c918f3fa62e0e3..5f448886417f5063177cf597519558db348bf4d3 100644 (file)
@@ -206,8 +206,7 @@ static int i2c_atmel_remove(struct i2c_client *client)
        struct device *dev = &(client->dev);
        struct tpm_chip *chip = dev_get_drvdata(dev);
 
-       if (chip)
-               tpm_dev_vendor_release(chip);
+       tpm_dev_vendor_release(chip);
        tpm_remove_hardware(dev);
        kfree(chip);
        return 0;
index 23c7b137a7fdb47584b98429bc54f8e5c732d5dd..bbb4997438c3b4b6245b9d7072802703b6c4d0a1 100644 (file)
@@ -630,8 +630,7 @@ static int i2c_nuvoton_remove(struct i2c_client *client)
        struct device *dev = &(client->dev);
        struct tpm_chip *chip = dev_get_drvdata(dev);
 
-       if (chip)
-               tpm_dev_vendor_release(chip);
+       tpm_dev_vendor_release(chip);
        tpm_remove_hardware(dev);
        kfree(chip);
        return 0;