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 3b88f0b49e01b689a31cbd95c84d7ee69f7bc407..bf8b1cc0ea9c7681aab5feb4d968607866c6f70f 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 d4da31c0616c3a886d558d9e474560c363f1e7d4..7d88d76b14d6c92f8236e3bfac70c33925f38f4b 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 72ae5ce7295651a98468ba23a98fb01d3cfed490..896a5a989ddcecca26dd5348d1742269e32b6b9b 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 38d7073863a872d52e3eb0e53a654c53b72a95f2..8996e00cd63a8203ec53d46ccb922c21ddb47355 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 040696d0e49ccb03b20ef7afca6593c789a82b8e..1b4937dce6725f8a94da1eaec79d1987dc6920a6 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 686388f40317b630850173c1980fba54d2589372..2bacd9d80ecf717836eaffd5075d4a10c2dec063 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 ddba2bc861da6416629aaf7b75fea72840aefc01..6c065eff5a5a5f29645a63b8476063cc2321eab7 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 5df4d5a7ed9e259811b7c5f58e2a05a40271991f..3964f6e0f6afad9b59147a95035ea850ed760e5b 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 7457c3220f90a8143fa67cbd2df254130ef008e6..c9f05764e36df1049331fec9903639235085afb2 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 b363749d02e23bb1f63d3e71e7a3e563afdb3802..faab7691c21975805a04c374a3e63b357272edd1 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 d414e19e455930379d42c2cf72283bbc4929a9d9..de312d8eb974d543b44eb1a18ce60e908182c590 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 74ad353462a3fc844f291641d9afe4007b640e2e..d434753afab11fc84d208380dba4e96e3c938bf2 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 5548699b8b389f75d5fe123343dd5661445f41f1..038ff3549a7ac999e99cf6a9dfb3c83de0ce4a1c 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 317fe2b1f827fe28dab8ed14cde33c7f2124d160..6953097db4456f27cc698ce208841280762f37ca 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 fabb50bde844468e6819d3d4d04637c7a56263bf..91aaa9fc43a4a5774bfeea1b7079407c936d7a85 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 04d2ee6ff577ea0ceee38920d1b7fdccb017783a..599ea85cfd30c7c0f95def09593288e7f7bc5fb5 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 673b905af6fe57672ae613e69cfae600a7f096f0..2f745cabf4f248aec628ef4422e1e1cd8d373254 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 3d7492f38337314ddb8c6fb986a20d6a130386a0..76fc19ffe21d2fefae90724a157ae89041acb226 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 4e20571cb4c3820c026271aec5493e59628373e1..75bd3ea5119490da8ca83c20809a33ab5e4f9c6a 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 d8e39f4a57acc2804b4e0136f6c4302a7c146451..679fcfea942c2f701d69bd70ed88d3b53ebd1d18 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 1c75d98c85a7856b268b5f4f5d2e9b7e23be3780..6b880e282d9906b393f219724dd99b4c24be4087 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 f42d3219cdcc4c162f9f8b1f004cb118a982d431..b5219bbe856db7790240d6d6900d6471d5ecfaa1 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 d9704b174d3a202d116de556dbf34f90c10e2c1e..b6a30044e814bdbe3419ae233ed6f4c7b9f710ee 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 3f9da5c3cb53463f26fb55be6c105f8ccdcbc8f3..0fb4cc628f29cf4be2287116385d4e65b4be74cf 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 136eb3715870cdc6ac0783683d9b5721a150e196..a4dfb3052dc092722975757f169c7639082d77f1 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 b85a19e3554f516bcb68d92c6a2e3fbfd81591c4..ce82548916bbc688470812465f3c3c3baf0e1fc8 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 f5e96b36acdad25642f3c6829bcda30fb4766238..6717e3c9549b25dbc2782d480ca635d530b0e93e 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 9145096f80ea7c7c3bb8fd1ab294b34558bf0cf5..de27e6079d84f40f22cb483986e8d394ea644de6 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 88b4dbe3e5b52e5af55fafaceb3ec12f3cc1cd97..11c5855256e8c5a69547295e089b6e68f8ff0bbb 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 3969ffc1bc8d3b1be35f5a48206c9b62f1b513e9..867ac7aa10d2c16df6c4f2ea9876449ac615411c 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 f4c3aff3895bc5f7821a981d0064af64ea2b66e1..1272ef7b579494dab0b15cdc75dad90cfe5df931 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 90f997a905b53c4453e63338f6bdbbdf0edca8a8..50035c25c3f70aed98ce186bee08a6b9504fe94c 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 e47ab6c1177f554d5ab4a1003b457414097bfbce..096b0925f41bab10819c900e014708c1eca4c990 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 4e806d56c55d382121e81e960a9630a15ec33ddc..912e614d039d71d53f83c4499ddf6a90ed24e230 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 b12152536976aa608a315de8ca8622f11ac9e367..76a190b2220bd465016071118440b5fc90708116 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 6323c3d37ef710c27b35f619090335f7cc27bcd8..536cedeb38e66f0df1ac4c1efed1526a28a1b3c7 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 dd7b0d70d7917d131e3d22e186ec101216a776dc..05851bc32541f7c6917ed1ae9e434234baf9e5f0 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 5f0d75a45c8086ace84d19d77959d50f71f11bad..0cff742302a9fca607db01ee4496b88186748d37 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 068692a8aba5d3dda300b297f29fd025ba2d0396..af5cc64c622df1336c7ab270dfce8b522c36ccf4 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 d69569ce8d8db635b04c83afd9d411397b464041..091d4e23b6292ade9d42e27b7613f1a8ade52c47 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 4bf0e1df6a4aaf4bc8895d9f8cde7594c1cd9fac..7059a2762aebc1f2a4b09908f214d04e6ab54ee8 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 dd8f31737bb8258cc3c8c22d8027fce182b3fff5..feaa6f8b01ed67baea5de8c8a9dc853b21e8da1e 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 3a5b65cae360ab76f1ac78f980c4c88d23c06aa4..64dfb749386fc861f17993dac564f42f5da13601 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 edea1823fd36cd82414d0f31e830b02b69914c8c..20094b9899f093671ed95a1db0a8551449ff3cbb 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 5359efc80b2bcaec489213f9a81c05bdddd9126f..90c682e7407f98c8588c85444b370682e47e7b62 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 c994ab6f4e58b5184729e5f80e4d1264eabf434f..85332cfaa29dc92718a90c812ff30e8368e79da2 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 8f1442894ff951a22e8fc5d429569396c7cdf647..c8126d2efe95a9c4c6ed8e8d819d516a65e2aa81 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 32b714a6ed2d5f85061b4acb5a198dbcc12b61bd..9fbeaf17f00b70ea2ae604f18a578459b3220924 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 246bee0bee5336859120295556b8e8d90bc3695c..b56954830b3398a25ff7f725460bae57e242cd12 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 cd86477d971a3dd2795f787df794ce7713a03259..967ecde23e83ff53cc6c17c40baddec88b7be138 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 dcf50fbf6dc7e8c6dd3966430f8d26ec88fcfd7c..54d6c4869eb02de179138df50b030d2da4b36c88 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 ec7a4779f3fbf8f3c762efe191dcc7190439692f..80a6890cd45a0bc5b1101c864bb35691d1543235 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 84a004dde237e36ea21cdf6e66f62de3bded3eaa..026d1b88a317a824e3de8c24f37be28a80cea4e5 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 3f91cb43ec820f0146cbe94ec2bb7c0333f34a3d..127a8fda1da4abcf0a29ee029270a41066002e59 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 3a1a5e76cd68b978e26f69eadf5b43fa0407a7d4..795c7dad22bfb04f5fb58ff0c4cf33572ff1f4ad 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 56fa21688bdb26780ec6819c755d5310a0638f74..5e4167f6c63ef425ea4b4792565e2b96e9591de3 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 1a9805938e6df808d114fd41433e6e3c474532a7..a7f7e73082673dbb1b85ae6728d1b2e3cc67a922 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 e6f1e46d003df403df6c83240e56d52e84248e62..fd8724a3c19fd3e7eb751b122f0bee8b1643f8b2 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 8a16eb51481f4f1db7e0b095961c9d44d6a1cf1e..2da1db64126d19fc49860598d410dd9af11c52f7 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 69eae79e2087c70d76cadbe2c053e9afe8cbe5a0..4af4c1e5d0da25458f98439d09306b32bf114abe 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 b348172f19c3de1ae79c70b1a1fccfebfacd17db..f6beef5231403ce5ffea0e407cc5c7c01342fa89 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 7c7020099b0ff128a6eeaba6a9fcbba9bc166558..404153338df718d2d62874bc02c9b8948396cd2a 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 e96150d80a48f87197fa9f555a7a258d63cf3d11..4f6609dcdef3d443939621d8c7b07f3c72a23773 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 8f4989aba9a41a78051a0686954ab68551811fe5..2450cfa14de9dfe67657657399588241d4dfc636 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 e86c85addb388ffbd5d6d3271747a6b64e94c7df..05946fee4fd440a6a284e53584cf0b16d8194ab3 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 ee4e739936dded282d5e2a60ae78ad3296e67260..f7cd773f7292a1a3d582391a83d0f6a843c63034 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 d69809338498a560dd656316a8b1b237d7b575f8..2f872e95fbbadee2df4304c30120a04613bfada3 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 de1b16e94bb85affc233f49c5e68f5b1f90077d1..07111ca2445561702980070c2afe0655919bd808 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 c73e9c5c0077e78ad518f8bb19488b6a26fb926c..0aa9d6492df8f8584f93a4cf743ee79253aeab17 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 461023fd6a09adbf300c1779efc3ee241ac3fce6..8be6dade118cb97056a76cbcc5aef5dcd82f1b9c 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 704e36087ca26f02423e5b0d3e7de2c90930ade5..ac28019ba4c33cf4361b395164ce6b0ed4391d3f 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 89b6020a9a61563f19331ae528a25596dcffaf57..32896e5085bdcfb7090856e1d78f7523b40704d8 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 69fcc88d4f805bfdabb2ecd7d555f70f9c199b64..2384ea69a3f8d02af2626f5f3c97f7737cdde07d 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 4dbca1aad89d087db3a3714b65f549c9d5c951ac..ac12494c7930d679af17e3a0c77df03fe107c50e 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 b23db689d9951b0b3a2e4d8c8a0737d020941aa7..a38af3fee34a82913f88a2a1629a08d9006de09a 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 3e551f9d31d7d0afdf46b645a3338013a40ff44a..7f7d879aac6d55b6a265bce39faee4b8228c8398 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 f09f4831bad41fe1e4590d1fc6274dccb0d095ba..554e179c2e487dbd0709b051e73cea7e32837868 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 49a06d3876cf9dd7020a8b561ec214df05abc1f9..76e7d62d587023c682edca7b73225f93de4e8b12 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 833422e5fd6d0377ef5b9fdca75bd6148cfb7913..240424f06b98fccea7fa18161d9524d644e042c5 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 371cf4848ad561931231cc47e9dee0c4387ffaa2..998d99d189111f8e1671a28167b517e8b5157575 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 a37fac089010035374eacd6efacda341f9469abc..9e28f962e059d43231a47e7c505a116d0f584e53 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 5a493b15b25d26ec78cc612e9c0a028d0cd74c2b..426564d0fc39aed0b4cc10e5d6649cbc942fa24b 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 f49566dc96f80ed699e5e20d85b367955abf68f7..6475084aee1bb7d1f9f7901d94bd48b53f5ddfc8 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 fdbf5e68943c4764dc89b9a5c9811bde2c1951c6..56e371fd88fa1082029cb7432def580dd6a3379b 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 52ae730358303a60e323f9d01db7f878259d07f9..0293c493bc79f0184111307aa4b8fd44fdc750a4 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 45f39eb20638b433aa900bf2981b1e7fc1f38e98..b5e904c5b7c49e8d7e8d2a8ada90950aae58ef39 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 21916a30fb76cd7b69a057969f4adcdfbd25464f..b3655250d4a7b3b4865d2ebc02831918968e5ddf 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 a145b910525534dedd481b4affa998204eaab057..f389f9c004a9d3c2c487d65d07a0afbc66d35c0d 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 771962af3d0ac218792ccd9a1e7eb7f6b2076d9e..cbc4750c53f9a9bdab1a3abd4b6f706d2de94eb2 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 bfa0c637d56938a80647d05bbeaa0b07cf86b9f0..1a034471f10356a237b2442a38077cabde3a7077 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 76b194285e1c5b9ea4400d8cf242cb32271f8865..5be5112845e1edf93808bddd3a65fa93347f4997 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 b6ece47151b8f6c400045d91ef233310c9491134..1b4807ba46242bccc6dd3962bbf4a8fed5f58c4e 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),