Commit f050bb8f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

misc: 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.

While touching these drivers, fix alignment in apds990x.c and bh1770glc.c.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Link: https://lore.kernel.org/r/20230517220135.170379-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e9b7cd6

drivers/misc/ad525x_dpot-i2c.c

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

		.name	= "ad_dpot",

	},

	.probe_new	= ad_dpot_i2c_probe,

	.probe		= ad_dpot_i2c_probe,

	.remove		= ad_dpot_i2c_remove,

	.id_table	= ad_dpot_id,

};

drivers/misc/apds9802als.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static struct i2c_driver apds9802als_driver = { 
		.name = DRIVER_NAME,

		.pm = APDS9802ALS_PM_OPS,

	},

	.probe_new = apds9802als_probe,

	.probe = apds9802als_probe,

	.remove = apds9802als_remove,

	.id_table = apds9802als_id,

};

drivers/misc/apds990x.c

+2 −2
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ static struct i2c_driver apds990x_driver = { 
		.name	= "apds990x",

		.pm	= &apds990x_pm_ops,

	},

	.probe_new = apds990x_probe,

	.probe    = apds990x_probe,

	.remove	  = apds990x_remove,

	.id_table = apds990x_id,

};

drivers/misc/bh1770glc.c

+2 −2
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static struct i2c_driver bh1770_driver = { 
		.name	= "bh1770glc",

		.pm	= &bh1770_pm_ops,

	},

	.probe_new = bh1770_probe,

	.probe    = bh1770_probe,

	.remove	  = bh1770_remove,

	.id_table = bh1770_id,

};

drivers/misc/ds1682.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static struct i2c_driver ds1682_driver = { 
		.name = "ds1682",

		.of_match_table = ds1682_of_match,

	},

	.probe_new = ds1682_probe,

	.probe = ds1682_probe,

	.remove = ds1682_remove,

	.id_table = ds1682_id,

};