Commit 11b93281 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Rob Herring
Browse files

of: unittest: Convert to i2c's .probe_new() 



In struct i2c_driver, field new_probe replaces the soon to be deprecated
field probe.  Update unittest for this change. The probe function
doesn't make use of the i2c_device_id * parameter so it can be trivially
converted.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarFrank Rowand <frowand.list@gmail.com>
Link: https://lore.kernel.org/r/20221118224540.619276-510-uwe@kleine-koenig.org


[robh: Add Frank's commit msg addition]
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 3c75ce7c

drivers/of/unittest.c

+4 −6
Original line number Diff line number Diff line
@@ -2508,8 +2508,7 @@ static struct platform_driver unittest_i2c_bus_driver = { 
	},

};



static int unittest_i2c_dev_probe(struct i2c_client *client,

		const struct i2c_device_id *id)

static int unittest_i2c_dev_probe(struct i2c_client *client)

{

	struct device *dev = &client->dev;

	struct device_node *np = client->dev.of_node;
@@ -2541,7 +2540,7 @@ static struct i2c_driver unittest_i2c_dev_driver = { 
	.driver = {

		.name = "unittest-i2c-dev",

	},

	.probe = unittest_i2c_dev_probe,

	.probe_new = unittest_i2c_dev_probe,

	.remove = unittest_i2c_dev_remove,

	.id_table = unittest_i2c_dev_id,

};
@@ -2553,8 +2552,7 @@ static int unittest_i2c_mux_select_chan(struct i2c_mux_core *muxc, u32 chan) 
	return 0;

}



static int unittest_i2c_mux_probe(struct i2c_client *client,

		const struct i2c_device_id *id)

static int unittest_i2c_mux_probe(struct i2c_client *client)

{

	int i, nchans;

	struct device *dev = &client->dev;
@@ -2619,7 +2617,7 @@ static struct i2c_driver unittest_i2c_mux_driver = { 
	.driver = {

		.name = "unittest-i2c-mux",

	},

	.probe = unittest_i2c_mux_probe,

	.probe_new = unittest_i2c_mux_probe,

	.remove = unittest_i2c_mux_remove,

	.id_table = unittest_i2c_mux_id,

};