usb: Switch i2c drivers back to use .probe()
After commitb8a1a4cd5a
("i2c: Provide a temporary .probe_new() call-back type"), all drivers being converted to .probe_new() and then03c835f498
("i2c: Switch .probe() to not take an id parameter") convert back to (the new) .probe() to be able to eventually drop .probe_new() from struct i2c_driver. While touching hd3ss3220.c fix a minor white space issue in the definition of struct hd3ss3220_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230517181528.167115-1-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3124387537
commit
7126a2aeab
@ -746,7 +746,7 @@ static struct i2c_driver usb251xb_i2c_driver = {
|
||||
.of_match_table = usb251xb_of_match,
|
||||
.pm = &usb251xb_pm_ops,
|
||||
},
|
||||
.probe_new = usb251xb_i2c_probe,
|
||||
.probe = usb251xb_i2c_probe,
|
||||
.id_table = usb251xb_id,
|
||||
};
|
||||
|
||||
|
@ -411,7 +411,7 @@ static struct i2c_driver usb3503_i2c_driver = {
|
||||
.pm = pm_ptr(&usb3503_i2c_pm_ops),
|
||||
.of_match_table = of_match_ptr(usb3503_of_match),
|
||||
},
|
||||
.probe_new = usb3503_i2c_probe,
|
||||
.probe = usb3503_i2c_probe,
|
||||
.remove = usb3503_i2c_remove,
|
||||
.id_table = usb3503_id,
|
||||
};
|
||||
|
@ -154,7 +154,7 @@ static struct i2c_driver usb4604_i2c_driver = {
|
||||
.pm = pm_ptr(&usb4604_i2c_pm_ops),
|
||||
.of_match_table = of_match_ptr(usb4604_of_match),
|
||||
},
|
||||
.probe_new = usb4604_i2c_probe,
|
||||
.probe = usb4604_i2c_probe,
|
||||
.id_table = usb4604_id,
|
||||
};
|
||||
module_i2c_driver(usb4604_i2c_driver);
|
||||
|
@ -132,7 +132,7 @@ static struct i2c_driver isp1301_driver = {
|
||||
.name = DRV_NAME,
|
||||
.of_match_table = isp1301_of_match,
|
||||
},
|
||||
.probe_new = isp1301_probe,
|
||||
.probe = isp1301_probe,
|
||||
.remove = isp1301_remove,
|
||||
.id_table = isp1301_id,
|
||||
};
|
||||
|
@ -1584,7 +1584,7 @@ static struct i2c_driver anx7411_driver = {
|
||||
.of_match_table = anx_match_table,
|
||||
.pm = &anx7411_pm_ops,
|
||||
},
|
||||
.probe_new = anx7411_i2c_probe,
|
||||
.probe = anx7411_i2c_probe,
|
||||
.remove = anx7411_i2c_remove,
|
||||
|
||||
.id_table = anx7411_id,
|
||||
|
@ -292,8 +292,8 @@ static struct i2c_driver hd3ss3220_driver = {
|
||||
.name = "hd3ss3220",
|
||||
.of_match_table = dev_ids,
|
||||
},
|
||||
.probe_new = hd3ss3220_probe,
|
||||
.remove = hd3ss3220_remove,
|
||||
.probe = hd3ss3220_probe,
|
||||
.remove = hd3ss3220_remove,
|
||||
};
|
||||
|
||||
module_i2c_driver(hd3ss3220_driver);
|
||||
|
@ -206,7 +206,7 @@ static struct i2c_driver fsa4480_driver = {
|
||||
.name = "fsa4480",
|
||||
.of_match_table = fsa4480_of_table,
|
||||
},
|
||||
.probe_new = fsa4480_probe,
|
||||
.probe = fsa4480_probe,
|
||||
.remove = fsa4480_remove,
|
||||
.id_table = fsa4480_table,
|
||||
};
|
||||
|
@ -178,7 +178,7 @@ static struct i2c_driver pi3usb30532_driver = {
|
||||
.driver = {
|
||||
.name = "pi3usb30532",
|
||||
},
|
||||
.probe_new = pi3usb30532_probe,
|
||||
.probe = pi3usb30532_probe,
|
||||
.remove = pi3usb30532_remove,
|
||||
.id_table = pi3usb30532_table,
|
||||
};
|
||||
|
@ -949,7 +949,7 @@ static struct i2c_driver rt1719_driver = {
|
||||
.name = "rt1719",
|
||||
.of_match_table = rt1719_device_table,
|
||||
},
|
||||
.probe_new = rt1719_probe,
|
||||
.probe = rt1719_probe,
|
||||
.remove = rt1719_remove,
|
||||
};
|
||||
module_i2c_driver(rt1719_driver);
|
||||
|
@ -870,7 +870,7 @@ static struct i2c_driver stusb160x_driver = {
|
||||
.pm = &stusb160x_pm_ops,
|
||||
.of_match_table = stusb160x_of_match,
|
||||
},
|
||||
.probe_new = stusb160x_probe,
|
||||
.probe = stusb160x_probe,
|
||||
.remove = stusb160x_remove,
|
||||
};
|
||||
module_i2c_driver(stusb160x_driver);
|
||||
|
@ -1836,7 +1836,7 @@ static struct i2c_driver fusb302_driver = {
|
||||
.pm = &fusb302_pm_ops,
|
||||
.of_match_table = of_match_ptr(fusb302_dt_match),
|
||||
},
|
||||
.probe_new = fusb302_probe,
|
||||
.probe = fusb302_probe,
|
||||
.remove = fusb302_remove,
|
||||
.id_table = fusb302_i2c_device_id,
|
||||
};
|
||||
|
@ -895,7 +895,7 @@ static struct i2c_driver tcpci_i2c_driver = {
|
||||
.name = "tcpci",
|
||||
.of_match_table = of_match_ptr(tcpci_of_match),
|
||||
},
|
||||
.probe_new = tcpci_probe,
|
||||
.probe = tcpci_probe,
|
||||
.remove = tcpci_remove,
|
||||
.id_table = tcpci_id,
|
||||
};
|
||||
|
@ -508,7 +508,7 @@ static struct i2c_driver max_tcpci_i2c_driver = {
|
||||
.name = "maxtcpc",
|
||||
.of_match_table = of_match_ptr(max_tcpci_of_match),
|
||||
},
|
||||
.probe_new = max_tcpci_probe,
|
||||
.probe = max_tcpci_probe,
|
||||
.remove = max_tcpci_remove,
|
||||
.id_table = max_tcpci_id,
|
||||
};
|
||||
|
@ -412,7 +412,7 @@ static struct i2c_driver rt1711h_i2c_driver = {
|
||||
.name = "rt1711h",
|
||||
.of_match_table = of_match_ptr(rt1711h_of_match),
|
||||
},
|
||||
.probe_new = rt1711h_probe,
|
||||
.probe = rt1711h_probe,
|
||||
.remove = rt1711h_remove,
|
||||
.id_table = rt1711h_id,
|
||||
};
|
||||
|
@ -950,7 +950,7 @@ static struct i2c_driver tps6598x_i2c_driver = {
|
||||
.pm = &tps6598x_pm_ops,
|
||||
.of_match_table = tps6598x_of_match,
|
||||
},
|
||||
.probe_new = tps6598x_probe,
|
||||
.probe = tps6598x_probe,
|
||||
.remove = tps6598x_remove,
|
||||
.id_table = tps6598x_id,
|
||||
};
|
||||
|
@ -1495,7 +1495,7 @@ static struct i2c_driver ucsi_ccg_driver = {
|
||||
.acpi_match_table = amd_i2c_ucsi_match,
|
||||
.of_match_table = ucsi_ccg_of_match_table,
|
||||
},
|
||||
.probe_new = ucsi_ccg_probe,
|
||||
.probe = ucsi_ccg_probe,
|
||||
.remove = ucsi_ccg_remove,
|
||||
.id_table = ucsi_ccg_device_id,
|
||||
};
|
||||
|
@ -763,7 +763,7 @@ static struct i2c_driver ucsi_stm32g0_i2c_driver = {
|
||||
.of_match_table = of_match_ptr(ucsi_stm32g0_typec_of_match),
|
||||
.pm = pm_sleep_ptr(&ucsi_stm32g0_pm_ops),
|
||||
},
|
||||
.probe_new = ucsi_stm32g0_probe,
|
||||
.probe = ucsi_stm32g0_probe,
|
||||
.remove = ucsi_stm32g0_remove,
|
||||
.id_table = ucsi_stm32g0_typec_i2c_devid
|
||||
};
|
||||
|
@ -420,7 +420,7 @@ static const struct of_device_id wusb3801_of_match[] = {
|
||||
MODULE_DEVICE_TABLE(of, wusb3801_of_match);
|
||||
|
||||
static struct i2c_driver wusb3801_driver = {
|
||||
.probe_new = wusb3801_probe,
|
||||
.probe = wusb3801_probe,
|
||||
.remove = wusb3801_remove,
|
||||
.driver = {
|
||||
.name = "wusb3801",
|
||||
|
Loading…
Reference in New Issue
Block a user