Commit a4c7d794 authored by Rob Herring's avatar Rob Herring Committed by Jarkko Sakkinen
Browse files

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.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 9f8413c4

drivers/char/tpm/tpm_i2c_nuvoton.c

+4 −11
Original line number Diff line number Diff line
@@ -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,14 +546,7 @@ 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)

	if (i2c_get_match_data(client))

		chip->flags |= TPM_CHIP_FLAG_TPM2;



	init_waitqueue_head(&priv->read_queue);