]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tpm: remove unused data fields from I2C and OF device ID tables
authorJavier Martinez Canillas <javierm@redhat.com>
Fri, 22 Dec 2017 17:47:41 +0000 (18:47 +0100)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 8 Jan 2018 10:58:39 +0000 (12:58 +0200)
The data field for the entries in the device tables are set but not used.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@ziepe.ca>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
drivers/char/tpm/tpm_i2c_infineon.c

index 79d6bbb58e39b8f35610dfc867bdb5d7aa09fcdf..c1dd39eaaeebb1f474d2d9f8b0d1e98e3559f27f 100644 (file)
@@ -665,9 +665,9 @@ static int tpm_tis_i2c_init(struct device *dev)
 }
 
 static const struct i2c_device_id tpm_tis_i2c_table[] = {
-       {"tpm_i2c_infineon", 0},
-       {"slb9635tt", 0},
-       {"slb9645tt", 1},
+       {"tpm_i2c_infineon"},
+       {"slb9635tt"},
+       {"slb9645tt"},
        {},
 };
 
@@ -675,24 +675,9 @@ MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table);
 
 #ifdef CONFIG_OF
 static const struct of_device_id tpm_tis_i2c_of_match[] = {
-       {
-               .name = "tpm_i2c_infineon",
-               .type = "tpm",
-               .compatible = "infineon,tpm_i2c_infineon",
-               .data = (void *)0
-       },
-       {
-               .name = "slb9635tt",
-               .type = "tpm",
-               .compatible = "infineon,slb9635tt",
-               .data = (void *)0
-       },
-       {
-               .name = "slb9645tt",
-               .type = "tpm",
-               .compatible = "infineon,slb9645tt",
-               .data = (void *)1
-       },
+       {.compatible = "infineon,tpm_i2c_infineon"},
+       {.compatible = "infineon,slb9635tt"},
+       {.compatible = "infineon,slb9645tt"},
        {},
 };
 MODULE_DEVICE_TABLE(of, tpm_tis_i2c_of_match);