Commit be6f48a7 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jarkko Sakkinen
Browse files

tpm: Switch i2c drivers back to use .probe() 



After commit b8a1a4cd ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f4 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent 2d7f105e

drivers/char/tpm/st33zp24/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static struct i2c_driver st33zp24_i2c_driver = { 
		.of_match_table = of_match_ptr(of_st33zp24_i2c_match),

		.acpi_match_table = ACPI_PTR(st33zp24_i2c_acpi_match),

	},

	.probe_new = st33zp24_i2c_probe,

	.probe = st33zp24_i2c_probe,

	.remove = st33zp24_i2c_remove,

	.id_table = st33zp24_i2c_id

};

drivers/char/tpm/tpm_i2c_atmel.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static SIMPLE_DEV_PM_OPS(i2c_atmel_pm_ops, tpm_pm_suspend, tpm_pm_resume); 


static struct i2c_driver i2c_atmel_driver = {

	.id_table = i2c_atmel_id,

	.probe_new = i2c_atmel_probe,

	.probe = i2c_atmel_probe,

	.remove = i2c_atmel_remove,

	.driver = {

		.name = I2C_DRIVER_NAME,

drivers/char/tpm/tpm_i2c_infineon.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static void tpm_tis_i2c_remove(struct i2c_client *client) 


static struct i2c_driver tpm_tis_i2c_driver = {

	.id_table = tpm_tis_i2c_table,

	.probe_new = tpm_tis_i2c_probe,

	.probe = tpm_tis_i2c_probe,

	.remove = tpm_tis_i2c_remove,

	.driver = {

		   .name = "tpm_i2c_infineon",

drivers/char/tpm/tpm_i2c_nuvoton.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static SIMPLE_DEV_PM_OPS(i2c_nuvoton_pm_ops, tpm_pm_suspend, tpm_pm_resume); 


static struct i2c_driver i2c_nuvoton_driver = {

	.id_table = i2c_nuvoton_id,

	.probe_new = i2c_nuvoton_probe,

	.probe = i2c_nuvoton_probe,

	.remove = i2c_nuvoton_remove,

	.driver = {

		.name = "tpm_i2c_nuvoton",

drivers/char/tpm/tpm_tis_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static struct i2c_driver tpm_tis_i2c_driver = { 
		.pm = &tpm_tis_pm,

		.of_match_table = of_match_ptr(of_tis_i2c_match),

	},

	.probe_new = tpm_tis_i2c_probe,

	.probe = tpm_tis_i2c_probe,

	.remove = tpm_tis_i2c_remove,

	.id_table = tpm_tis_i2c_id,

};