Commit fe20b1dc authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sebastian Reichel
Browse files

power: supply: 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>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent eae36cb8

drivers/power/supply/adp5061.c

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

		.name = KBUILD_MODNAME,

	},

	.probe_new = adp5061_probe,

	.probe = adp5061_probe,

	.id_table = adp5061_id,

};

module_i2c_driver(adp5061_driver);

drivers/power/supply/bd99954-charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static struct i2c_driver bd9995x_driver = { 
		.name = "bd9995x-charger",

		.of_match_table = bd9995x_of_match,

	},

	.probe_new = bd9995x_probe,

	.probe = bd9995x_probe,

};

module_i2c_driver(bd9995x_driver);

drivers/power/supply/bq2415x_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ static struct i2c_driver bq2415x_driver = { 
		.of_match_table = of_match_ptr(bq2415x_of_match_table),

		.acpi_match_table = ACPI_PTR(bq2415x_i2c_acpi_match),

	},

	.probe_new = bq2415x_probe,

	.probe = bq2415x_probe,

	.remove = bq2415x_remove,

	.id_table = bq2415x_i2c_id_table,

};

drivers/power/supply/bq24190_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ static const struct of_device_id bq24190_of_match[] = { 
MODULE_DEVICE_TABLE(of, bq24190_of_match);



static struct i2c_driver bq24190_driver = {

	.probe_new	= bq24190_probe,

	.probe		= bq24190_probe,

	.remove		= bq24190_remove,

	.shutdown	= bq24190_shutdown,

	.id_table	= bq24190_i2c_ids,

drivers/power/supply/bq24257_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ static struct i2c_driver bq24257_driver = { 
		.acpi_match_table = ACPI_PTR(bq24257_acpi_match),

		.pm = &bq24257_pm,

	},

	.probe_new = bq24257_probe,

	.probe = bq24257_probe,

	.remove = bq24257_remove,

	.id_table = bq24257_i2c_ids,

};