tpm: nuvoton: Use i2c_get_match_data()
Subsystems (2)
PATCH RESEND 1/1 tpm: nuvoton: Use i2c_get_match_data()
Use preferred i2c_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.
--- drivers/char/tpm/tpm_i2c_nuvoton.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/char/tpm/tpm_i2c_nuvoton.c +4 -11
@@ -19,7 +19,8 @@#include <linux/interrupt.h> #include <linux/wait.h> #include <linux/i2c.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/property.h> #include "tpm.h" /* I2C interface offsets */
@@ -524,7 +525,6 @@ static int get_vid(struct i2c_client *client, u32 *res)static int i2c_nuvoton_probe (struct i2c_client *client) { -const struct i2c_device_id *id =i2c_client_get_device_id (client);int rc;struct tpm_chip *chip;struct device *dev = &client->dev;
@@ -546,15 +546,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client)if (!priv)return -ENOMEM ; -if (dev->of_node) { -const struct of_device_id *of_id; - - of_id =of_match_device (dev->driver->of_match_table, dev); -if (of_id && of_id->data ==OF_IS_TPM2 ) - chip->flags |=TPM_CHIP_FLAG_TPM2 ; - }else -if (id->driver_data ==I2C_IS_TPM2 ) - chip->flags |=TPM_CHIP_FLAG_TPM2 ; +if (i2c_get_match_data (client)) + chip->flags |=TPM_CHIP_FLAG_TPM2 ;init_waitqueue_head (&priv->read_queue);
Signature · 1 line
2.42.0
Quoted 39 lines · Rob Herring
Use preferred
i2c_get_match_data()instead ofof_match_device()to get the driver match data. With this, adjust the includes to explicitly include the correct headers.Signed-off-by Rob Herring <[email protected]>--- drivers/char/tpm/tpm_i2c_nuvoton.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)drivers/char/tpm/tpm_i2c_nuvoton.c +2
-6@@ -19,7 +19,8 @@#include <linux/interrupt.h> #include <linux/wait.h> #include <linux/i2c.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/property.h> #include "tpm.h" /* I2C interface offsets */ @@ -524,7 +525,6 @@ static int get_vid(struct i2c_client *client, u32 *res)static int i2c_nuvoton_probe (struct i2c_client *client) { -const struct i2c_device_id *id =i2c_client_get_device_id (client);int rc;struct tpm_chip *chip;struct device *dev = &client->dev;@@ -546,15 +546,8 @@ static int i2c_nuvoton_probe(struct i2c_client *client)if (!priv)return -ENOMEM ; -if (dev->of_node) { -const struct of_device_id *of_id; - - of_id =of_match_device (dev->driver->of_match_table, dev);
drivers/char/tpm/tpm_i2c_nuvoton.c static int i2c_nuvoton_probe(struct i2c_client *client) · line 553
Quoted 10 lines
drivers/char/tpm/tpm_i2c_nuvoton.c +2
-5-if (of_id && of_id->data ==OF_IS_TPM2 ) - chip->flags |=TPM_CHIP_FLAG_TPM2 ; - }else -if (id->driver_data ==I2C_IS_TPM2 ) - chip->flags |=TPM_CHIP_FLAG_TPM2 ; +if (i2c_get_match_data (client)) + chip->flags |=TPM_CHIP_FLAG_TPM2 ;init_waitqueue_head (&priv->read_queue);
OK, apologies for having to do a resend. I'll pick this, thanks!
BR, Jarkko
Quoted 8 lines · Jarkko Sakkinen
Quoted 7 lines · Rob Herring
Use preferred
i2c_get_match_data()instead ofof_match_device()to get the driver match data. With this, adjust the includes to explicitly include the correct headers.Signed-off-by Rob Herring <[email protected]>--- drivers/char/tpm/tpm_i2c_nuvoton.c | 15 ++++-----------
[...]
Quoted 2 lines
OK, apologies for having to do a resend. I'll pick this, thanks!
This is now duplicated as commit ebf2d4e8e582 in Jarkko's tree and commit 319e31686b9f in Rob's tree: