mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
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: Uwe Kleine-König <[email protected]> Reviewed-by: Frank Rowand <[email protected]> Link: https://lore.kernel.org/r/[email protected] [robh: Add Frank's commit msg addition] Signed-off-by: Rob Herring <[email protected]>
This commit is contained in:
1 parent
3c75ce7cc3
commit
11b9328154
1 file changed
+4
-6
@@ -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,
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user