mirror of
https://github.com/armbian/linux-cix.git
synced 2026-01-06 12:30:45 -08:00
Input: Switch i2c drivers back to use .probe()
After commitb8a1a4cd5a("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then03c835f498("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: Uwe 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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
17caa38a98
commit
d8bde56dfd
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -229,7 +229,7 @@ static struct i2c_driver cypress_sf_driver = {
|
||||
.of_match_table = of_match_ptr(cypress_sf_of_match),
|
||||
},
|
||||
.id_table = cypress_sf_id_table,
|
||||
.probe_new = cypress_sf_probe,
|
||||
.probe = cypress_sf_probe,
|
||||
};
|
||||
module_i2c_driver(cypress_sf_driver);
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ static struct i2c_driver dir685_tk_i2c_driver = {
|
||||
.name = "dlink-dir685-touchkeys",
|
||||
.of_match_table = of_match_ptr(dir685_tk_of_match),
|
||||
},
|
||||
.probe_new = dir685_tk_probe,
|
||||
.probe = dir685_tk_probe,
|
||||
.id_table = dir685_tk_id,
|
||||
};
|
||||
module_i2c_driver(dir685_tk_i2c_driver);
|
||||
|
||||
@@ -826,7 +826,7 @@ static struct i2c_driver lm8323_i2c_driver = {
|
||||
.name = "lm8323",
|
||||
.pm = pm_sleep_ptr(&lm8323_pm_ops),
|
||||
},
|
||||
.probe_new = lm8323_probe,
|
||||
.probe = lm8323_probe,
|
||||
.remove = lm8323_remove,
|
||||
.id_table = lm8323_id,
|
||||
};
|
||||
|
||||
@@ -218,7 +218,7 @@ static struct i2c_driver lm8333_driver = {
|
||||
.driver = {
|
||||
.name = "lm8333",
|
||||
},
|
||||
.probe_new = lm8333_probe,
|
||||
.probe = lm8333_probe,
|
||||
.remove = lm8333_remove,
|
||||
.id_table = lm8333_id,
|
||||
};
|
||||
|
||||
@@ -280,7 +280,7 @@ static struct i2c_driver max7359_i2c_driver = {
|
||||
.name = "max7359",
|
||||
.pm = pm_sleep_ptr(&max7359_pm),
|
||||
},
|
||||
.probe_new = max7359_probe,
|
||||
.probe = max7359_probe,
|
||||
.id_table = max7359_ids,
|
||||
};
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ static struct i2c_driver mcs_touchkey_driver = {
|
||||
.name = "mcs_touchkey",
|
||||
.pm = pm_sleep_ptr(&mcs_touchkey_pm_ops),
|
||||
},
|
||||
.probe_new = mcs_touchkey_probe,
|
||||
.probe = mcs_touchkey_probe,
|
||||
.remove = mcs_touchkey_remove,
|
||||
.shutdown = mcs_touchkey_shutdown,
|
||||
.id_table = mcs_touchkey_id,
|
||||
|
||||
@@ -389,7 +389,7 @@ static struct i2c_driver mpr_touchkey_driver = {
|
||||
.of_match_table = of_match_ptr(mpr121_touchkey_dt_match_table),
|
||||
},
|
||||
.id_table = mpr121_id,
|
||||
.probe_new = mpr_touchkey_probe,
|
||||
.probe = mpr_touchkey_probe,
|
||||
};
|
||||
|
||||
module_i2c_driver(mpr_touchkey_driver);
|
||||
|
||||
@@ -455,7 +455,7 @@ static const struct of_device_id ppkb_of_match[] = {
|
||||
MODULE_DEVICE_TABLE(of, ppkb_of_match);
|
||||
|
||||
static struct i2c_driver ppkb_driver = {
|
||||
.probe_new = ppkb_probe,
|
||||
.probe = ppkb_probe,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.of_match_table = ppkb_of_match,
|
||||
|
||||
@@ -588,7 +588,7 @@ static struct i2c_driver qt1050_driver = {
|
||||
.of_match_table = of_match_ptr(qt1050_of_match),
|
||||
.pm = pm_sleep_ptr(&qt1050_pm_ops),
|
||||
},
|
||||
.probe_new = qt1050_probe,
|
||||
.probe = qt1050_probe,
|
||||
};
|
||||
|
||||
module_i2c_driver(qt1050_driver);
|
||||
|
||||
@@ -271,7 +271,7 @@ static struct i2c_driver qt1070_driver = {
|
||||
.pm = pm_sleep_ptr(&qt1070_pm_ops),
|
||||
},
|
||||
.id_table = qt1070_id,
|
||||
.probe_new = qt1070_probe,
|
||||
.probe = qt1070_probe,
|
||||
.remove = qt1070_remove,
|
||||
};
|
||||
|
||||
|
||||
@@ -460,7 +460,7 @@ static struct i2c_driver qt2160_driver = {
|
||||
},
|
||||
|
||||
.id_table = qt2160_idtable,
|
||||
.probe_new = qt2160_probe,
|
||||
.probe = qt2160_probe,
|
||||
.remove = qt2160_remove,
|
||||
};
|
||||
|
||||
|
||||
@@ -350,7 +350,7 @@ static struct i2c_driver tca6416_keypad_driver = {
|
||||
.name = "tca6416-keypad",
|
||||
.pm = pm_sleep_ptr(&tca6416_keypad_dev_pm_ops),
|
||||
},
|
||||
.probe_new = tca6416_keypad_probe,
|
||||
.probe = tca6416_keypad_probe,
|
||||
.remove = tca6416_keypad_remove,
|
||||
.id_table = tca6416_id,
|
||||
};
|
||||
|
||||
@@ -370,7 +370,7 @@ static struct i2c_driver tca8418_keypad_driver = {
|
||||
.name = "tca8418_keypad",
|
||||
.of_match_table = tca8418_dt_ids,
|
||||
},
|
||||
.probe_new = tca8418_keypad_probe,
|
||||
.probe = tca8418_keypad_probe,
|
||||
.id_table = tca8418_id,
|
||||
};
|
||||
|
||||
|
||||
@@ -356,7 +356,7 @@ static struct i2c_driver tm2_touchkey_driver = {
|
||||
.pm = pm_sleep_ptr(&tm2_touchkey_pm_ops),
|
||||
.of_match_table = tm2_touchkey_of_match,
|
||||
},
|
||||
.probe_new = tm2_touchkey_probe,
|
||||
.probe = tm2_touchkey_probe,
|
||||
.id_table = tm2_touchkey_id_table,
|
||||
};
|
||||
module_i2c_driver(tm2_touchkey_driver);
|
||||
|
||||
@@ -86,7 +86,7 @@ static struct i2c_driver ad714x_i2c_driver = {
|
||||
.name = "ad714x_captouch",
|
||||
.pm = pm_sleep_ptr(&ad714x_pm),
|
||||
},
|
||||
.probe_new = ad714x_i2c_probe,
|
||||
.probe = ad714x_i2c_probe,
|
||||
.id_table = ad714x_id,
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user