Commit d8bde56d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dmitry Torokhov
Browse files

Input: 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>
Link: https://lore.kernel.org/r/20230517164645.162294-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 17caa38a

drivers/input/joystick/as5011.c

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

		.name = "as5011",

	},

	.probe_new	= as5011_probe,

	.probe		= as5011_probe,

	.remove		= as5011_remove,

	.id_table	= as5011_id,

};

drivers/input/joystick/qwiic-joystick.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct i2c_driver qwiic_driver = { 
		.of_match_table	= of_match_ptr(of_qwiic_match),

	},

	.id_table	= qwiic_id_table,

	.probe_new	= qwiic_probe,

	.probe		= qwiic_probe,

};

module_i2c_driver(qwiic_driver);

drivers/input/keyboard/adp5588-keys.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ static struct i2c_driver adp5588_driver = { 
		.of_match_table = adp5588_of_match,

		.pm   = pm_sleep_ptr(&adp5588_dev_pm_ops),

	},

	.probe_new = adp5588_probe,

	.probe    = adp5588_probe,

	.remove   = adp5588_remove,

	.id_table = adp5588_id,

};

drivers/input/keyboard/adp5589-keys.c

+1 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ static struct i2c_driver adp5589_driver = { 
		.name = KBUILD_MODNAME,

		.pm = pm_sleep_ptr(&adp5589_dev_pm_ops),

	},

	.probe_new = adp5589_probe,

	.probe = adp5589_probe,

	.id_table = adp5589_id,

};

drivers/input/keyboard/cap11xx.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static struct i2c_driver cap11xx_i2c_driver = { 
		.of_match_table = cap11xx_dt_ids,

	},

	.id_table	= cap11xx_i2c_ids,

	.probe_new	= cap11xx_i2c_probe,

	.probe		= cap11xx_i2c_probe,

};



module_i2c_driver(cap11xx_i2c_driver);