Commit 834a9dc4 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wolfram Sang
Browse files

i2c: Convert drivers to new .probe() callback 



Now that .probe() was changed not to get the id parameter, drivers can
be converted back to that with the eventual goal to drop .probe_new().

Implement that for the i2c drivers that are part of the i2c core.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 2f2afad9

drivers/i2c/i2c-core-base.c

+1 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,7 @@ static int dummy_probe(struct i2c_client *client) 


static struct i2c_driver dummy_driver = {

	.driver.name	= "dummy",

	.probe_new	= dummy_probe,

	.probe		= dummy_probe,

	.id_table	= dummy_id,

};

drivers/i2c/i2c-slave-eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static struct i2c_driver i2c_slave_eeprom_driver = { 
	.driver = {

		.name = "i2c-slave-eeprom",

	},

	.probe_new = i2c_slave_eeprom_probe,

	.probe = i2c_slave_eeprom_probe,

	.remove = i2c_slave_eeprom_remove,

	.id_table = i2c_slave_eeprom_id,

};

drivers/i2c/i2c-slave-testunit.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct i2c_driver i2c_slave_testunit_driver = { 
	.driver = {

		.name = "i2c-slave-testunit",

	},

	.probe_new = i2c_slave_testunit_probe,

	.probe = i2c_slave_testunit_probe,

	.remove = i2c_slave_testunit_remove,

	.id_table = i2c_slave_testunit_id,

};

drivers/i2c/i2c-smbus.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static struct i2c_driver smbalert_driver = { 
	.driver = {

		.name	= "smbus_alert",

	},

	.probe_new	= smbalert_probe,

	.probe		= smbalert_probe,

	.remove		= smbalert_remove,

	.id_table	= smbalert_ids,

};