Input: Switch i2c drivers back to use .probe()

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("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>

diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 3b88f0b..bf8b1cc 100644 (file)
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -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,
 };

diff --git a/drivers/input/joystick/qwiic-joystick.c b/drivers/input/joystick/qwiic-joystick.c
index d4da31c..7d88d76 100644 (file)
--- a/drivers/input/joystick/qwiic-joystick.c
+++ b/drivers/input/joystick/qwiic-joystick.c
@@ -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);
 

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 72ae5ce..896a5a9 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -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,
 };

diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 38d7073..8996e00 100644 (file)
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -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,
 };
 

diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index 040696d..1b4937d 100644 (file)
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -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);

diff --git a/drivers/input/keyboard/cypress-sf.c b/drivers/input/keyboard/cypress-sf.c
index 686388f..2bacd9d 100644 (file)
--- a/drivers/input/keyboard/cypress-sf.c
+++ b/drivers/input/keyboard/cypress-sf.c
@@ -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);
 

diff --git a/drivers/input/keyboard/dlink-dir685-touchkeys.c b/drivers/input/keyboard/dlink-dir685-touchkeys.c
index ddba2bc..6c065ef 100644 (file)
--- a/drivers/input/keyboard/dlink-dir685-touchkeys.c
+++ b/drivers/input/keyboard/dlink-dir685-touchkeys.c
@@ -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);

diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
index 5df4d5a..3964f6e 100644 (file)
--- a/drivers/input/keyboard/lm8323.c
+++ b/drivers/input/keyboard/lm8323.c
@@ -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,
 };

diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c
index 7457c32..c9f0576 100644 (file)
--- a/drivers/input/keyboard/lm8333.c
+++ b/drivers/input/keyboard/lm8333.c
@@ -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,
 };

diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index b363749..faab769 100644 (file)
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -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,
 };
 

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index d414e19..de312d8 100644 (file)
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -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,

diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index 74ad353..d434753 100644 (file)
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -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);

diff --git a/drivers/input/keyboard/pinephone-keyboard.c b/drivers/input/keyboard/pinephone-keyboard.c
index 5548699..038ff35 100644 (file)
--- a/drivers/input/keyboard/pinephone-keyboard.c
+++ b/drivers/input/keyboard/pinephone-keyboard.c
@@ -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,

diff --git a/drivers/input/keyboard/qt1050.c b/drivers/input/keyboard/qt1050.c
index 317fe2b..6953097 100644 (file)
--- a/drivers/input/keyboard/qt1050.c
+++ b/drivers/input/keyboard/qt1050.c
@@ -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);

diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c
index fabb50b..91aaa9f 100644 (file)
--- a/drivers/input/keyboard/qt1070.c
+++ b/drivers/input/keyboard/qt1070.c
@@ -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,
 };
 

diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 04d2ee6..599ea85 100644 (file)
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -460,7 +460,7 @@ static struct i2c_driver qt2160_driver = {
        },
 
        .id_table       = qt2160_idtable,
-       .probe_new      = qt2160_probe,
+       .probe          = qt2160_probe,
        .remove         = qt2160_remove,
 };
 

diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c
index 673b905..2f745ca 100644 (file)
--- a/drivers/input/keyboard/tca6416-keypad.c
+++ b/drivers/input/keyboard/tca6416-keypad.c
@@ -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,
 };

diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index 3d7492f..76fc19f 100644 (file)
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -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,
 };
 

diff --git a/drivers/input/keyboard/tm2-touchkey.c b/drivers/input/keyboard/tm2-touchkey.c
index 4e20571..75bd3ea 100644 (file)
--- a/drivers/input/keyboard/tm2-touchkey.c
+++ b/drivers/input/keyboard/tm2-touchkey.c
@@ -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);

diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c
index d8e39f4..679fcfe 100644 (file)
--- a/drivers/input/misc/ad714x-i2c.c
+++ b/drivers/input/misc/ad714x-i2c.c
@@ -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,
 };
 

diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
index 1c75d98..6b880e2 100644 (file)
--- a/drivers/input/misc/adxl34x-i2c.c
+++ b/drivers/input/misc/adxl34x-i2c.c
@@ -135,7 +135,7 @@ static struct i2c_driver adxl34x_driver = {
                .pm = pm_sleep_ptr(&adxl34x_pm),
                .of_match_table = adxl34x_of_id,
        },
-       .probe_new = adxl34x_i2c_probe,
+       .probe    = adxl34x_i2c_probe,
        .remove   = adxl34x_i2c_remove,
        .id_table = adxl34x_id,
 };

diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index f42d321..b5219bb 100644 (file)
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -201,7 +201,7 @@ static struct i2c_driver apanel_driver = {
        .driver = {
                .name = APANEL,
        },
-       .probe_new      = apanel_probe,
+       .probe          = apanel_probe,
        .shutdown       = apanel_shutdown,
        .id_table       = apanel_id,
 };

diff --git a/drivers/input/misc/atmel_captouch.c b/drivers/input/misc/atmel_captouch.c
index d9704b1..b6a3004 100644 (file)
--- a/drivers/input/misc/atmel_captouch.c
+++ b/drivers/input/misc/atmel_captouch.c
@@ -263,7 +263,7 @@ static const struct i2c_device_id atmel_captouch_id[] = {
 MODULE_DEVICE_TABLE(i2c, atmel_captouch_id);
 
 static struct i2c_driver atmel_captouch_driver = {
-       .probe_new      = atmel_captouch_probe,
+       .probe          = atmel_captouch_probe,
        .id_table       = atmel_captouch_id,
        .driver         = {
                .name   = "atmel_captouch",

diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index 3f9da5c..0fb4cc6 100644 (file)
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -551,7 +551,7 @@ static struct i2c_driver bma150_driver = {
        },
        .class          = I2C_CLASS_HWMON,
        .id_table       = bma150_id,
-       .probe_new      = bma150_probe,
+       .probe          = bma150_probe,
        .remove         = bma150_remove,
 };
 

diff --git a/drivers/input/misc/cma3000_d0x_i2c.c b/drivers/input/misc/cma3000_d0x_i2c.c
index 136eb37..a4dfb30 100644 (file)
--- a/drivers/input/misc/cma3000_d0x_i2c.c
+++ b/drivers/input/misc/cma3000_d0x_i2c.c
@@ -97,7 +97,7 @@ static const struct i2c_device_id cma3000_i2c_id[] = {
 MODULE_DEVICE_TABLE(i2c, cma3000_i2c_id);
 
 static struct i2c_driver cma3000_i2c_driver = {
-       .probe_new      = cma3000_i2c_probe,
+       .probe          = cma3000_i2c_probe,
        .remove         = cma3000_i2c_remove,
        .id_table       = cma3000_i2c_id,
        .driver = {

diff --git a/drivers/input/misc/da7280.c b/drivers/input/misc/da7280.c
index b85a19e..ce82548 100644 (file)
--- a/drivers/input/misc/da7280.c
+++ b/drivers/input/misc/da7280.c
@@ -1321,7 +1321,7 @@ static struct i2c_driver da7280_driver = {
                .of_match_table = of_match_ptr(da7280_of_match),
                .pm = pm_sleep_ptr(&da7280_pm_ops),
        },
-       .probe_new = da7280_probe,
+       .probe = da7280_probe,
        .id_table = da7280_i2c_id,
 };
 module_i2c_driver(da7280_driver);

diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index f5e96b3..6717e3c 100644 (file)
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -615,7 +615,7 @@ static const struct of_device_id drv260x_of_match[] = {
 MODULE_DEVICE_TABLE(of, drv260x_of_match);
 
 static struct i2c_driver drv260x_driver = {
-       .probe_new      = drv260x_probe,
+       .probe          = drv260x_probe,
        .driver         = {
                .name   = "drv260x-haptics",
                .of_match_table = drv260x_of_match,

diff --git a/drivers/input/misc/drv2665.c b/drivers/input/misc/drv2665.c
index 9145096..de27e60 100644 (file)
--- a/drivers/input/misc/drv2665.c
+++ b/drivers/input/misc/drv2665.c
@@ -297,7 +297,7 @@ MODULE_DEVICE_TABLE(of, drv2665_of_match);
 #endif
 
 static struct i2c_driver drv2665_driver = {
-       .probe_new      = drv2665_probe,
+       .probe          = drv2665_probe,
        .driver         = {
                .name   = "drv2665-haptics",
                .of_match_table = of_match_ptr(drv2665_of_match),

diff --git a/drivers/input/misc/drv2667.c b/drivers/input/misc/drv2667.c
index 88b4dbe..11c5855 100644 (file)
--- a/drivers/input/misc/drv2667.c
+++ b/drivers/input/misc/drv2667.c
@@ -474,7 +474,7 @@ MODULE_DEVICE_TABLE(of, drv2667_of_match);
 #endif
 
 static struct i2c_driver drv2667_driver = {
-       .probe_new      = drv2667_probe,
+       .probe          = drv2667_probe,
        .driver         = {
                .name   = "drv2667-haptics",
                .of_match_table = of_match_ptr(drv2667_of_match),

diff --git a/drivers/input/misc/ibm-panel.c b/drivers/input/misc/ibm-panel.c
index 3969ffc..867ac7a 100644 (file)
--- a/drivers/input/misc/ibm-panel.c
+++ b/drivers/input/misc/ibm-panel.c
@@ -189,7 +189,7 @@ static struct i2c_driver ibm_panel_driver = {
                .name = DEVICE_NAME,
                .of_match_table = ibm_panel_match,
        },
-       .probe_new = ibm_panel_probe,
+       .probe = ibm_panel_probe,
        .remove = ibm_panel_remove,
 };
 module_i2c_driver(ibm_panel_driver);

diff --git a/drivers/input/misc/iqs269a.c b/drivers/input/misc/iqs269a.c
index f4c3aff..1272ef7 100644 (file)
--- a/drivers/input/misc/iqs269a.c
+++ b/drivers/input/misc/iqs269a.c
@@ -1746,7 +1746,7 @@ static struct i2c_driver iqs269_i2c_driver = {
                .of_match_table = iqs269_of_match,
                .pm = pm_sleep_ptr(&iqs269_pm),
        },
-       .probe_new = iqs269_probe,
+       .probe = iqs269_probe,
 };
 module_i2c_driver(iqs269_i2c_driver);
 

diff --git a/drivers/input/misc/iqs626a.c b/drivers/input/misc/iqs626a.c
index 90f997a..50035c2 100644 (file)
--- a/drivers/input/misc/iqs626a.c
+++ b/drivers/input/misc/iqs626a.c
@@ -1822,7 +1822,7 @@ static struct i2c_driver iqs626_i2c_driver = {
                .of_match_table = iqs626_of_match,
                .pm = pm_sleep_ptr(&iqs626_pm),
        },
-       .probe_new = iqs626_probe,
+       .probe = iqs626_probe,
 };
 module_i2c_driver(iqs626_i2c_driver);
 

diff --git a/drivers/input/misc/iqs7222.c b/drivers/input/misc/iqs7222.c
index e47ab6c..096b092 100644 (file)
--- a/drivers/input/misc/iqs7222.c
+++ b/drivers/input/misc/iqs7222.c
@@ -2593,7 +2593,7 @@ static struct i2c_driver iqs7222_i2c_driver = {
                .name = "iqs7222",
                .of_match_table = iqs7222_of_match,
        },
-       .probe_new = iqs7222_probe,
+       .probe = iqs7222_probe,
 };
 module_i2c_driver(iqs7222_i2c_driver);
 

diff --git a/drivers/input/misc/kxtj9.c b/drivers/input/misc/kxtj9.c
index 4e806d5..912e614 100644 (file)
--- a/drivers/input/misc/kxtj9.c
+++ b/drivers/input/misc/kxtj9.c
@@ -538,7 +538,7 @@ static struct i2c_driver kxtj9_driver = {
                .name   = NAME,
                .pm     = pm_sleep_ptr(&kxtj9_pm_ops),
        },
-       .probe_new      = kxtj9_probe,
+       .probe          = kxtj9_probe,
        .id_table       = kxtj9_id,
 };
 

diff --git a/drivers/input/misc/mma8450.c b/drivers/input/misc/mma8450.c
index b121525..76a190b 100644 (file)
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
@@ -202,7 +202,7 @@ static struct i2c_driver mma8450_driver = {
                .name   = MMA8450_DRV_NAME,
                .of_match_table = mma8450_dt_ids,
        },
-       .probe_new      = mma8450_probe,
+       .probe          = mma8450_probe,
        .id_table       = mma8450_id,
 };
 

diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index 6323c3d..536cede 100644 (file)
--- a/drivers/input/misc/pcf8574_keypad.c
+++ b/drivers/input/misc/pcf8574_keypad.c
@@ -199,7 +199,7 @@ static struct i2c_driver pcf8574_kp_driver = {
                .name  = DRV_NAME,
                .pm = pm_sleep_ptr(&pcf8574_kp_pm_ops),
        },
-       .probe_new = pcf8574_kp_probe,
+       .probe    = pcf8574_kp_probe,
        .remove   = pcf8574_kp_remove,
        .id_table = pcf8574_kp_id,
 };

diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c
index dd7b0d7..05851bc 100644 (file)
--- a/drivers/input/mouse/cyapa.c
+++ b/drivers/input/mouse/cyapa.c
@@ -1489,7 +1489,7 @@ static struct i2c_driver cyapa_driver = {
                .of_match_table = of_match_ptr(cyapa_of_match),
        },
 
-       .probe_new = cyapa_probe,
+       .probe = cyapa_probe,
        .id_table = cyapa_id_table,
 };
 

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 5f0d75a..0cff742 100644 (file)
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -1424,7 +1424,7 @@ static struct i2c_driver elan_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
                .dev_groups = elan_sysfs_groups,
        },
-       .probe_new      = elan_probe,
+       .probe          = elan_probe,
        .id_table       = elan_id,
 };
 

diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index 068692a..af5cc64 100644 (file)
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -650,7 +650,7 @@ static struct i2c_driver synaptics_i2c_driver = {
                .pm     = pm_sleep_ptr(&synaptics_i2c_pm),
        },
 
-       .probe_new      = synaptics_i2c_probe,
+       .probe          = synaptics_i2c_probe,
        .remove         = synaptics_i2c_remove,
 
        .id_table       = synaptics_i2c_id_table,

diff --git a/drivers/input/rmi4/rmi_i2c.c b/drivers/input/rmi4/rmi_i2c.c
index d69569c..091d4e2 100644 (file)
--- a/drivers/input/rmi4/rmi_i2c.c
+++ b/drivers/input/rmi4/rmi_i2c.c
@@ -377,7 +377,7 @@ static struct i2c_driver rmi_i2c_driver = {
                .of_match_table = of_match_ptr(rmi_i2c_of_match),
        },
        .id_table       = rmi_id,
-       .probe_new      = rmi_i2c_probe,
+       .probe          = rmi_i2c_probe,
 };
 
 module_i2c_driver(rmi_i2c_driver);

diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c
index 4bf0e1d..7059a27 100644 (file)
--- a/drivers/input/rmi4/rmi_smbus.c
+++ b/drivers/input/rmi4/rmi_smbus.c
@@ -418,7 +418,7 @@ static struct i2c_driver rmi_smb_driver = {
                .pm     = pm_ptr(&rmi_smb_pm),
        },
        .id_table       = rmi_id,
-       .probe_new      = rmi_smb_probe,
+       .probe          = rmi_smb_probe,
        .remove         = rmi_smb_remove,
 };
 

diff --git a/drivers/input/touchscreen/ad7879-i2c.c b/drivers/input/touchscreen/ad7879-i2c.c
index dd8f317..feaa6f8 100644 (file)
--- a/drivers/input/touchscreen/ad7879-i2c.c
+++ b/drivers/input/touchscreen/ad7879-i2c.c
@@ -62,7 +62,7 @@ static struct i2c_driver ad7879_i2c_driver = {
                .pm     = &ad7879_pm_ops,
                .of_match_table = of_match_ptr(ad7879_i2c_dt_ids),
        },
-       .probe_new      = ad7879_i2c_probe,
+       .probe          = ad7879_i2c_probe,
        .id_table       = ad7879_id,
 };
 

diff --git a/drivers/input/touchscreen/ar1021_i2c.c b/drivers/input/touchscreen/ar1021_i2c.c
index 3a5b65c..64dfb74 100644 (file)
--- a/drivers/input/touchscreen/ar1021_i2c.c
+++ b/drivers/input/touchscreen/ar1021_i2c.c
@@ -182,7 +182,7 @@ static struct i2c_driver ar1021_i2c_driver = {
                .of_match_table = ar1021_i2c_of_match,
        },
 
-       .probe_new      = ar1021_i2c_probe,
+       .probe          = ar1021_i2c_probe,
        .id_table       = ar1021_i2c_id,
 };
 module_i2c_driver(ar1021_i2c_driver);

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index edea182..20094b9 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3462,7 +3462,7 @@ static struct i2c_driver mxt_driver = {
                .acpi_match_table = ACPI_PTR(mxt_acpi_id),
                .pm     = pm_sleep_ptr(&mxt_pm_ops),
        },
-       .probe_new      = mxt_probe,
+       .probe          = mxt_probe,
        .remove         = mxt_remove,
        .id_table       = mxt_id,
 };

diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c
index 5359efc..90c682e 100644 (file)
--- a/drivers/input/touchscreen/auo-pixcir-ts.c
+++ b/drivers/input/touchscreen/auo-pixcir-ts.c
@@ -636,7 +636,7 @@ static struct i2c_driver auo_pixcir_driver = {
                .pm     = pm_sleep_ptr(&auo_pixcir_pm_ops),
                .of_match_table = of_match_ptr(auo_pixcir_ts_dt_idtable),
        },
-       .probe_new      = auo_pixcir_probe,
+       .probe          = auo_pixcir_probe,
        .id_table       = auo_pixcir_idtable,
 };
 

diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
index c994ab6..85332cf 100644 (file)
--- a/drivers/input/touchscreen/bu21013_ts.c
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -617,7 +617,7 @@ static struct i2c_driver bu21013_driver = {
                .name   =       DRIVER_TP,
                .pm     =       pm_sleep_ptr(&bu21013_dev_pm_ops),
        },
-       .probe_new      =       bu21013_probe,
+       .probe          =       bu21013_probe,
        .remove         =       bu21013_remove,
        .id_table       =       bu21013_id,
 };

diff --git a/drivers/input/touchscreen/bu21029_ts.c b/drivers/input/touchscreen/bu21029_ts.c
index 8f14428..c8126d2 100644 (file)
--- a/drivers/input/touchscreen/bu21029_ts.c
+++ b/drivers/input/touchscreen/bu21029_ts.c
@@ -474,7 +474,7 @@ static struct i2c_driver bu21029_driver = {
                .pm             = pm_sleep_ptr(&bu21029_pm_ops),
        },
        .id_table       = bu21029_ids,
-       .probe_new      = bu21029_probe,
+       .probe          = bu21029_probe,
 };
 module_i2c_driver(bu21029_driver);
 

diff --git a/drivers/input/touchscreen/chipone_icn8318.c b/drivers/input/touchscreen/chipone_icn8318.c
index 32b714a..9fbeaf1 100644 (file)
--- a/drivers/input/touchscreen/chipone_icn8318.c
+++ b/drivers/input/touchscreen/chipone_icn8318.c
@@ -264,7 +264,7 @@ static struct i2c_driver icn8318_driver = {
                .pm     = pm_sleep_ptr(&icn8318_pm_ops),
                .of_match_table = icn8318_of_match,
        },
-       .probe_new = icn8318_probe,
+       .probe = icn8318_probe,
        .id_table = icn8318_i2c_id,
 };
 

diff --git a/drivers/input/touchscreen/chipone_icn8505.c b/drivers/input/touchscreen/chipone_icn8505.c
index 246bee0..b569548 100644 (file)
--- a/drivers/input/touchscreen/chipone_icn8505.c
+++ b/drivers/input/touchscreen/chipone_icn8505.c
@@ -498,7 +498,7 @@ static struct i2c_driver icn8505_driver = {
                .pm     = pm_sleep_ptr(&icn8505_pm_ops),
                .acpi_match_table = icn8505_acpi_match,
        },
-       .probe_new = icn8505_probe,
+       .probe = icn8505_probe,
 };
 
 module_i2c_driver(icn8505_driver);

diff --git a/drivers/input/touchscreen/cy8ctma140.c b/drivers/input/touchscreen/cy8ctma140.c
index cd86477..967ecde 100644 (file)
--- a/drivers/input/touchscreen/cy8ctma140.c
+++ b/drivers/input/touchscreen/cy8ctma140.c
@@ -344,7 +344,7 @@ static struct i2c_driver cy8ctma140_driver = {
                .of_match_table = cy8ctma140_of_match,
        },
        .id_table       = cy8ctma140_idtable,
-       .probe_new      = cy8ctma140_probe,
+       .probe          = cy8ctma140_probe,
 };
 module_i2c_driver(cy8ctma140_driver);
 

diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
index dcf50fb..54d6c48 100644 (file)
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -279,7 +279,7 @@ static struct i2c_driver cy8ctmg110_driver = {
                .pm     = pm_sleep_ptr(&cy8ctmg110_pm),
        },
        .id_table       = cy8ctmg110_idtable,
-       .probe_new      = cy8ctmg110_probe,
+       .probe          = cy8ctmg110_probe,
 };
 
 module_i2c_driver(cy8ctmg110_driver);

diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c
index ec7a477..80a6890 100644 (file)
--- a/drivers/input/touchscreen/cyttsp4_i2c.c
+++ b/drivers/input/touchscreen/cyttsp4_i2c.c
@@ -60,7 +60,7 @@ static struct i2c_driver cyttsp4_i2c_driver = {
                .name   = CYTTSP4_I2C_NAME,
                .pm     = pm_ptr(&cyttsp4_pm_ops),
        },
-       .probe_new      = cyttsp4_i2c_probe,
+       .probe          = cyttsp4_i2c_probe,
        .remove         = cyttsp4_i2c_remove,
        .id_table       = cyttsp4_i2c_id,
 };

diff --git a/drivers/input/touchscreen/cyttsp5.c b/drivers/input/touchscreen/cyttsp5.c
index 84a004d..026d1b8 100644 (file)
--- a/drivers/input/touchscreen/cyttsp5.c
+++ b/drivers/input/touchscreen/cyttsp5.c
@@ -962,7 +962,7 @@ static struct i2c_driver cyttsp5_i2c_driver = {
                .of_match_table = cyttsp5_of_match,
                .pm = &cyttsp5_pm,
        },
-       .probe_new = cyttsp5_i2c_probe,
+       .probe = cyttsp5_i2c_probe,
        .id_table = cyttsp5_i2c_id,
 };
 module_i2c_driver(cyttsp5_i2c_driver);

diff --git a/drivers/input/touchscreen/cyttsp_i2c.c b/drivers/input/touchscreen/cyttsp_i2c.c
index 3f91cb4..127a8fd 100644 (file)
--- a/drivers/input/touchscreen/cyttsp_i2c.c
+++ b/drivers/input/touchscreen/cyttsp_i2c.c
@@ -66,7 +66,7 @@ static struct i2c_driver cyttsp_i2c_driver = {
                .pm     = pm_sleep_ptr(&cyttsp_pm_ops),
                .of_match_table = cyttsp_of_i2c_match,
        },
-       .probe_new      = cyttsp_i2c_probe,
+       .probe          = cyttsp_i2c_probe,
        .id_table       = cyttsp_i2c_id,
 };
 

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 3a1a5e7..795c7da 100644 (file)
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -1511,7 +1511,7 @@ static struct i2c_driver edt_ft5x06_ts_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .id_table = edt_ft5x06_ts_id,
-       .probe_new = edt_ft5x06_ts_probe,
+       .probe    = edt_ft5x06_ts_probe,
        .remove   = edt_ft5x06_ts_remove,
 };
 

diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index 56fa216..5e4167f 100644 (file)
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -291,7 +291,7 @@ static struct i2c_driver eeti_ts_driver = {
                .pm = pm_sleep_ptr(&eeti_ts_pm),
                .of_match_table = of_match_ptr(of_eeti_ts_match),
        },
-       .probe_new = eeti_ts_probe,
+       .probe = eeti_ts_probe,
        .id_table = eeti_ts_id,
 };
 

diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
index 1a98059..a7f7e73 100644 (file)
--- a/drivers/input/touchscreen/egalax_ts.c
+++ b/drivers/input/touchscreen/egalax_ts.c
@@ -264,7 +264,7 @@ static struct i2c_driver egalax_ts_driver = {
                .of_match_table = egalax_ts_dt_ids,
        },
        .id_table       = egalax_ts_id,
-       .probe_new      = egalax_ts_probe,
+       .probe          = egalax_ts_probe,
 };
 
 module_i2c_driver(egalax_ts_driver);

diff --git a/drivers/input/touchscreen/ektf2127.c b/drivers/input/touchscreen/ektf2127.c
index e6f1e46..fd8724a 100644 (file)
--- a/drivers/input/touchscreen/ektf2127.c
+++ b/drivers/input/touchscreen/ektf2127.c
@@ -351,7 +351,7 @@ static struct i2c_driver ektf2127_driver = {
                .pm     = pm_sleep_ptr(&ektf2127_pm_ops),
                .of_match_table = of_match_ptr(ektf2127_of_match),
        },
-       .probe_new = ektf2127_probe,
+       .probe = ektf2127_probe,
        .id_table = ektf2127_i2c_id,
 };
 module_i2c_driver(ektf2127_driver);

diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 8a16eb5..2da1db6 100644 (file)
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1673,7 +1673,7 @@ MODULE_DEVICE_TABLE(of, elants_of_match);
 #endif
 
 static struct i2c_driver elants_i2c_driver = {
-       .probe_new = elants_i2c_probe,
+       .probe = elants_i2c_probe,
        .id_table = elants_i2c_id,
        .driver = {
                .name = DEVICE_NAME,

diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c
index 69eae79..4af4c1e 100644 (file)
--- a/drivers/input/touchscreen/exc3000.c
+++ b/drivers/input/touchscreen/exc3000.c
@@ -460,7 +460,7 @@ static struct i2c_driver exc3000_driver = {
                .of_match_table = of_match_ptr(exc3000_of_match),
        },
        .id_table       = exc3000_id,
-       .probe_new      = exc3000_probe,
+       .probe          = exc3000_probe,
 };
 
 module_i2c_driver(exc3000_driver);

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
index b348172..f6beef5 100644 (file)
--- a/drivers/input/touchscreen/goodix.c
+++ b/drivers/input/touchscreen/goodix.c
@@ -1536,7 +1536,7 @@ MODULE_DEVICE_TABLE(of, goodix_of_match);
 #endif
 
 static struct i2c_driver goodix_ts_driver = {
-       .probe_new = goodix_ts_probe,
+       .probe = goodix_ts_probe,
        .remove = goodix_ts_remove,
        .id_table = goodix_ts_id,
        .driver = {

diff --git a/drivers/input/touchscreen/hideep.c b/drivers/input/touchscreen/hideep.c
index 7c70200..4041533 100644 (file)
--- a/drivers/input/touchscreen/hideep.c
+++ b/drivers/input/touchscreen/hideep.c
@@ -1136,7 +1136,7 @@ static struct i2c_driver hideep_driver = {
                .pm                     = pm_sleep_ptr(&hideep_pm_ops),
        },
        .id_table       = hideep_i2c_id,
-       .probe_new      = hideep_probe,
+       .probe          = hideep_probe,
 };
 
 module_i2c_driver(hideep_driver);

diff --git a/drivers/input/touchscreen/himax_hx83112b.c b/drivers/input/touchscreen/himax_hx83112b.c
index e96150d..4f6609d 100644 (file)
--- a/drivers/input/touchscreen/himax_hx83112b.c
+++ b/drivers/input/touchscreen/himax_hx83112b.c
@@ -349,7 +349,7 @@ MODULE_DEVICE_TABLE(of, himax_of_match);
 #endif
 
 static struct i2c_driver himax_ts_driver = {
-       .probe_new = himax_probe,
+       .probe = himax_probe,
        .id_table = himax_ts_id,
        .driver = {
                .name = "Himax-hx83112b-TS",

diff --git a/drivers/input/touchscreen/hycon-hy46xx.c b/drivers/input/touchscreen/hycon-hy46xx.c
index 8f4989a..2450cfa 100644 (file)
--- a/drivers/input/touchscreen/hycon-hy46xx.c
+++ b/drivers/input/touchscreen/hycon-hy46xx.c
@@ -580,7 +580,7 @@ static struct i2c_driver hycon_hy46xx_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .id_table = hycon_hy46xx_id,
-       .probe_new = hycon_hy46xx_probe,
+       .probe = hycon_hy46xx_probe,
 };
 
 module_i2c_driver(hycon_hy46xx_driver);

diff --git a/drivers/input/touchscreen/hynitron_cstxxx.c b/drivers/input/touchscreen/hynitron_cstxxx.c
index e86c85a..05946fe 100644 (file)
--- a/drivers/input/touchscreen/hynitron_cstxxx.c
+++ b/drivers/input/touchscreen/hynitron_cstxxx.c
@@ -488,7 +488,7 @@ static struct i2c_driver hynitron_i2c_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .id_table = hyn_tpd_id,
-       .probe_new = hyn_probe,
+       .probe = hyn_probe,
 };
 
 module_i2c_driver(hynitron_i2c_driver);

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index ee4e739..f7cd773 100644 (file)
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -1053,7 +1053,7 @@ static struct i2c_driver ili210x_ts_driver = {
                .of_match_table = ili210x_dt_ids,
        },
        .id_table = ili210x_i2c_id,
-       .probe_new = ili210x_i2c_probe,
+       .probe = ili210x_i2c_probe,
 };
 
 module_i2c_driver(ili210x_ts_driver);

diff --git a/drivers/input/touchscreen/ilitek_ts_i2c.c b/drivers/input/touchscreen/ilitek_ts_i2c.c
index d698093..2f872e9 100644 (file)
--- a/drivers/input/touchscreen/ilitek_ts_i2c.c
+++ b/drivers/input/touchscreen/ilitek_ts_i2c.c
@@ -679,7 +679,7 @@ static struct i2c_driver ilitek_ts_i2c_driver = {
                .of_match_table = of_match_ptr(ilitek_ts_i2c_match),
                .acpi_match_table = ACPI_PTR(ilitekts_acpi_id),
        },
-       .probe_new = ilitek_ts_i2c_probe,
+       .probe = ilitek_ts_i2c_probe,
        .id_table = ilitek_ts_i2c_id,
 };
 module_i2c_driver(ilitek_ts_i2c_driver);

diff --git a/drivers/input/touchscreen/imagis.c b/drivers/input/touchscreen/imagis.c
index de1b16e..07111ca 100644 (file)
--- a/drivers/input/touchscreen/imagis.c
+++ b/drivers/input/touchscreen/imagis.c
@@ -357,7 +357,7 @@ static struct i2c_driver imagis_ts_driver = {
                .pm = pm_sleep_ptr(&imagis_pm_ops),
                .of_match_table = of_match_ptr(imagis_of_match),
        },
-       .probe_new = imagis_probe,
+       .probe = imagis_probe,
 };
 
 module_i2c_driver(imagis_ts_driver);

diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c
index c73e9c5..0aa9d64 100644 (file)
--- a/drivers/input/touchscreen/iqs5xx.c
+++ b/drivers/input/touchscreen/iqs5xx.c
@@ -1093,7 +1093,7 @@ static struct i2c_driver iqs5xx_i2c_driver = {
                .pm             = pm_sleep_ptr(&iqs5xx_pm),
        },
        .id_table       = iqs5xx_id,
-       .probe_new      = iqs5xx_probe,
+       .probe          = iqs5xx_probe,
 };
 module_i2c_driver(iqs5xx_i2c_driver);
 

diff --git a/drivers/input/touchscreen/max11801_ts.c b/drivers/input/touchscreen/max11801_ts.c
index 461023f..8be6dad 100644 (file)
--- a/drivers/input/touchscreen/max11801_ts.c
+++ b/drivers/input/touchscreen/max11801_ts.c
@@ -230,7 +230,7 @@ static struct i2c_driver max11801_ts_driver = {
                .of_match_table = max11801_ts_dt_ids,
        },
        .id_table       = max11801_ts_id,
-       .probe_new      = max11801_ts_probe,
+       .probe          = max11801_ts_probe,
 };
 
 module_i2c_driver(max11801_ts_driver);

diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index 704e360..ac28019 100644 (file)
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -272,7 +272,7 @@ static const struct i2c_device_id mcs5000_ts_id[] = {
 MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id);
 
 static struct i2c_driver mcs5000_ts_driver = {
-       .probe_new      = mcs5000_ts_probe,
+       .probe          = mcs5000_ts_probe,
        .driver = {
                .name = "mcs5000_ts",
                .pm   = pm_sleep_ptr(&mcs5000_ts_pm),

diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c
index 89b6020..32896e5 100644 (file)
--- a/drivers/input/touchscreen/melfas_mip4.c
+++ b/drivers/input/touchscreen/melfas_mip4.c
@@ -1591,7 +1591,7 @@ MODULE_DEVICE_TABLE(i2c, mip4_i2c_ids);
 
 static struct i2c_driver mip4_driver = {
        .id_table = mip4_i2c_ids,
-       .probe_new = mip4_probe,
+       .probe = mip4_probe,
        .driver = {
                .name = MIP4_DEVICE_NAME,
                .of_match_table = of_match_ptr(mip4_of_match),

diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index 69fcc88..2384ea6 100644 (file)
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -221,7 +221,7 @@ static struct i2c_driver migor_ts_driver = {
                .name = "migor_ts",
                .pm = pm_sleep_ptr(&migor_ts_pm),
        },
-       .probe_new = migor_ts_probe,
+       .probe = migor_ts_probe,
        .remove = migor_ts_remove,
        .id_table = migor_ts_id,
 };

diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c
index 4dbca1a..ac12494 100644 (file)
--- a/drivers/input/touchscreen/mms114.c
+++ b/drivers/input/touchscreen/mms114.c
@@ -638,7 +638,7 @@ static struct i2c_driver mms114_driver = {
                .pm     = pm_sleep_ptr(&mms114_pm_ops),
                .of_match_table = of_match_ptr(mms114_dt_match),
        },
-       .probe_new      = mms114_probe,
+       .probe          = mms114_probe,
        .id_table       = mms114_id,
 };
 

diff --git a/drivers/input/touchscreen/msg2638.c b/drivers/input/touchscreen/msg2638.c
index b23db68..a38af3f 100644 (file)
--- a/drivers/input/touchscreen/msg2638.c
+++ b/drivers/input/touchscreen/msg2638.c
@@ -492,7 +492,7 @@ static const struct of_device_id msg2638_of_match[] = {
 MODULE_DEVICE_TABLE(of, msg2638_of_match);
 
 static struct i2c_driver msg2638_ts_driver = {
-       .probe_new = msg2638_ts_probe,
+       .probe = msg2638_ts_probe,
        .driver = {
                .name = "MStar-TS",
                .pm = pm_sleep_ptr(&msg2638_pm_ops),

diff --git a/drivers/input/touchscreen/novatek-nvt-ts.c b/drivers/input/touchscreen/novatek-nvt-ts.c
index 3e551f9..7f7d879 100644 (file)
--- a/drivers/input/touchscreen/novatek-nvt-ts.c
+++ b/drivers/input/touchscreen/novatek-nvt-ts.c
@@ -290,7 +290,7 @@ static struct i2c_driver nvt_ts_driver = {
                .name   = "novatek-nvt-ts",
                .pm     = pm_sleep_ptr(&nvt_ts_pm_ops),
        },
-       .probe_new = nvt_ts_probe,
+       .probe = nvt_ts_probe,
        .id_table = nvt_ts_i2c_id,
 };
 

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index f09f483..554e179 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -617,7 +617,7 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
                .pm     = pm_sleep_ptr(&pixcir_dev_pm_ops),
                .of_match_table = of_match_ptr(pixcir_of_match),
        },
-       .probe_new      = pixcir_i2c_ts_probe,
+       .probe          = pixcir_i2c_ts_probe,
        .id_table       = pixcir_i2c_ts_id,
 };
 

diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
index 49a06d3..76e7d62 100644 (file)
--- a/drivers/input/touchscreen/raydium_i2c_ts.c
+++ b/drivers/input/touchscreen/raydium_i2c_ts.c
@@ -1273,7 +1273,7 @@ MODULE_DEVICE_TABLE(of, raydium_of_match);
 #endif
 
 static struct i2c_driver raydium_i2c_driver = {
-       .probe_new = raydium_i2c_probe,
+       .probe = raydium_i2c_probe,
        .id_table = raydium_i2c_id,
        .driver = {
                .name = "raydium_ts",

diff --git a/drivers/input/touchscreen/rohm_bu21023.c b/drivers/input/touchscreen/rohm_bu21023.c
index 833422e..240424f 100644 (file)
--- a/drivers/input/touchscreen/rohm_bu21023.c
+++ b/drivers/input/touchscreen/rohm_bu21023.c
@@ -1183,7 +1183,7 @@ static struct i2c_driver rohm_bu21023_i2c_driver = {
        .driver = {
                .name = BU21023_NAME,
        },
-       .probe_new = rohm_bu21023_i2c_probe,
+       .probe = rohm_bu21023_i2c_probe,
        .id_table = rohm_bu21023_i2c_id,
 };
 module_i2c_driver(rohm_bu21023_i2c_driver);

diff --git a/drivers/input/touchscreen/s6sy761.c b/drivers/input/touchscreen/s6sy761.c
index 371cf48..998d99d 100644 (file)
--- a/drivers/input/touchscreen/s6sy761.c
+++ b/drivers/input/touchscreen/s6sy761.c
@@ -538,7 +538,7 @@ static struct i2c_driver s6sy761_driver = {
                .of_match_table = of_match_ptr(s6sy761_of_match),
                .pm = pm_ptr(&s6sy761_pm_ops),
        },
-       .probe_new = s6sy761_probe,
+       .probe = s6sy761_probe,
        .remove = s6sy761_remove,
        .id_table = s6sy761_id,
 };

diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index a37fac0..9e28f96 100644 (file)
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -826,7 +826,7 @@ MODULE_DEVICE_TABLE(of, silead_ts_of_match);
 #endif
 
 static struct i2c_driver silead_ts_driver = {
-       .probe_new = silead_ts_probe,
+       .probe = silead_ts_probe,
        .id_table = silead_ts_id,
        .driver = {
                .name = SILEAD_TS_NAME,

diff --git a/drivers/input/touchscreen/sis_i2c.c b/drivers/input/touchscreen/sis_i2c.c
index 5a493b1..426564d 100644 (file)
--- a/drivers/input/touchscreen/sis_i2c.c
+++ b/drivers/input/touchscreen/sis_i2c.c
@@ -393,7 +393,7 @@ static struct i2c_driver sis_ts_driver = {
                .name   = SIS_I2C_NAME,
                .of_match_table = of_match_ptr(sis_ts_dt_ids),
        },
-       .probe_new      = sis_ts_probe,
+       .probe          = sis_ts_probe,
        .id_table       = sis_ts_id,
 };
 module_i2c_driver(sis_ts_driver);

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index f49566d..6475084 100644 (file)
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -384,7 +384,7 @@ static const struct of_device_id st1232_ts_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids);
 
 static struct i2c_driver st1232_ts_driver = {
-       .probe_new      = st1232_ts_probe,
+       .probe          = st1232_ts_probe,
        .id_table       = st1232_ts_id,
        .driver = {
                .name   = ST1232_TS_NAME,

diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index fdbf5e6..56e371f 100644 (file)
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -808,7 +808,7 @@ static struct i2c_driver stmfts_driver = {
                .pm = pm_ptr(&stmfts_pm_ops),
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
-       .probe_new = stmfts_probe,
+       .probe = stmfts_probe,
        .remove = stmfts_remove,
        .id_table = stmfts_id,
 };

diff --git a/drivers/input/touchscreen/sx8654.c b/drivers/input/touchscreen/sx8654.c
index 52ae730..0293c49 100644 (file)
--- a/drivers/input/touchscreen/sx8654.c
+++ b/drivers/input/touchscreen/sx8654.c
@@ -470,7 +470,7 @@ static struct i2c_driver sx8654_driver = {
                .of_match_table = of_match_ptr(sx8654_of_match),
        },
        .id_table = sx8654_id_table,
-       .probe_new = sx8654_probe,
+       .probe = sx8654_probe,
 };
 module_i2c_driver(sx8654_driver);
 

diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c
index 45f39eb..b5e904c 100644 (file)
--- a/drivers/input/touchscreen/tsc2004.c
+++ b/drivers/input/touchscreen/tsc2004.c
@@ -68,7 +68,7 @@ static struct i2c_driver tsc2004_driver = {
                .pm     = pm_sleep_ptr(&tsc200x_pm_ops),
        },
        .id_table       = tsc2004_idtable,
-       .probe_new      = tsc2004_probe,
+       .probe          = tsc2004_probe,
        .remove         = tsc2004_remove,
 };
 module_i2c_driver(tsc2004_driver);

diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index 21916a3..b365525 100644 (file)
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -418,7 +418,7 @@ static struct i2c_driver tsc2007_driver = {
                .of_match_table = tsc2007_of_match,
        },
        .id_table       = tsc2007_idtable,
-       .probe_new      = tsc2007_probe,
+       .probe          = tsc2007_probe,
 };
 
 module_i2c_driver(tsc2007_driver);

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index a145b91..f389f9c 100644 (file)
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -264,7 +264,7 @@ static struct i2c_driver wacom_i2c_driver = {
                .pm     = pm_sleep_ptr(&wacom_i2c_pm),
        },
 
-       .probe_new      = wacom_i2c_probe,
+       .probe          = wacom_i2c_probe,
        .id_table       = wacom_i2c_id,
 };
 module_i2c_driver(wacom_i2c_driver);

diff --git a/drivers/input/touchscreen/wdt87xx_i2c.c b/drivers/input/touchscreen/wdt87xx_i2c.c
index 771962a..cbc4750 100644 (file)
--- a/drivers/input/touchscreen/wdt87xx_i2c.c
+++ b/drivers/input/touchscreen/wdt87xx_i2c.c
@@ -1169,7 +1169,7 @@ static const struct acpi_device_id wdt87xx_acpi_id[] = {
 MODULE_DEVICE_TABLE(acpi, wdt87xx_acpi_id);
 
 static struct i2c_driver wdt87xx_driver = {
-       .probe_new      = wdt87xx_ts_probe,
+       .probe          = wdt87xx_ts_probe,
        .id_table       = wdt87xx_dev_id,
        .driver = {
                .name   = WDT87XX_NAME,

diff --git a/drivers/input/touchscreen/zet6223.c b/drivers/input/touchscreen/zet6223.c
index bfa0c63..1a03447 100644 (file)
--- a/drivers/input/touchscreen/zet6223.c
+++ b/drivers/input/touchscreen/zet6223.c
@@ -248,7 +248,7 @@ static struct i2c_driver zet6223_driver = {
                .name = "zet6223",
                .of_match_table = zet6223_of_match,
        },
-       .probe_new = zet6223_probe,
+       .probe = zet6223_probe,
        .id_table = zet6223_id
 };
 module_i2c_driver(zet6223_driver);

diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 76b1942..5be5112 100644 (file)
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -944,7 +944,7 @@ static struct i2c_driver zforce_driver = {
                .pm     = pm_sleep_ptr(&zforce_pm_ops),
                .of_match_table = of_match_ptr(zforce_dt_idtable),
        },
-       .probe_new      = zforce_probe,
+       .probe          = zforce_probe,
        .id_table       = zforce_idtable,
 };
 

diff --git a/drivers/input/touchscreen/zinitix.c b/drivers/input/touchscreen/zinitix.c
index b6ece47..1b4807b 100644 (file)
--- a/drivers/input/touchscreen/zinitix.c
+++ b/drivers/input/touchscreen/zinitix.c
@@ -617,7 +617,7 @@ MODULE_DEVICE_TABLE(of, zinitix_of_match);
 #endif
 
 static struct i2c_driver zinitix_ts_driver = {
-       .probe_new = zinitix_ts_probe,
+       .probe = zinitix_ts_probe,
        .driver = {
                .name = "Zinitix-TS",
                .pm = pm_sleep_ptr(&zinitix_pm_ops),