rtc: use simple i2c probe
Subsystems (2)
PATCH 1/1 rtc: use simple i2c probe
All these drivers have an i2c probe function which doesn't use the "struct i2c_device_id *id" parameter, so they can trivially be converted to the "probe_new" style of probe with a single argument.
This change was done using the following Coccinelle script, and fixed up for whitespace changes:
@ rule1 @
identifier fn;
identifier client, id;
@@
- static int fn(struct i2c_client *client, const struct i2c_device_id *id)
+ static int fn(struct i2c_client *client)
{
...when != id
}
@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@
struct i2c_driver driver = {
- .probe
+ .probe_new
=
(
fn
|
- &fn
+ fn
)
, };
--- drivers/rtc/rtc-ab-b5ze-s3.c | 5 ++--- drivers/rtc/rtc-ab-eoz9.c | 5 ++--- drivers/rtc/rtc-bq32k.c | 5 ++--- drivers/rtc/rtc-ds1374.c | 5 ++--- drivers/rtc/rtc-ds1672.c | 5 ++--- drivers/rtc/rtc-ds3232.c | 5 ++--- drivers/rtc/rtc-em3027.c | 5 ++--- drivers/rtc/rtc-fm3130.c | 5 ++--- drivers/rtc/rtc-hym8563.c | 5 ++--- drivers/rtc/rtc-isl12022.c | 5 ++--- drivers/rtc/rtc-max6900.c | 5 ++--- drivers/rtc/rtc-pcf8523.c | 5 ++--- drivers/rtc/rtc-pcf85363.c | 5 ++--- drivers/rtc/rtc-pcf8563.c | 5 ++--- drivers/rtc/rtc-pcf8583.c | 5 ++--- drivers/rtc/rtc-rv3029c2.c | 5 ++--- drivers/rtc/rtc-rx6110.c | 5 ++--- drivers/rtc/rtc-rx8581.c | 5 ++--- drivers/rtc/rtc-s35390a.c | 5 ++--- drivers/rtc/rtc-sd3078.c | 5 ++--- drivers/rtc/rtc-x1205.c | 5 ++--- 21 files changed, 42 insertions(+), 63 deletions(-)
drivers/rtc/rtc-ab-b5ze-s3.c +2 -3
@@ -817,8 +817,7 @@ static const struct regmap_config abb5zes3_rtc_regmap_config = { .val_bits = 8, }; -static int abb5zes3_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int abb5zes3_probe (struct i2c_client *client) {struct abb5zes3_rtc_data *data =NULL ;struct device *dev = &client->dev;
@@ -945,7 +944,7 @@ static struct i2c_driver abb5zes3_driver = { .pm = &abb5zes3_rtc_pm_ops, .of_match_table = of_match_ptr(abb5zes3_dt_match), }, - .probe = abb5zes3_probe, + .probe_new = abb5zes3_probe, .id_table = abb5zes3_id, };module_i2c_driver (abb5zes3_driver);
drivers/rtc/rtc-ab-eoz9.c +2 -3
@@ -495,8 +495,7 @@ static void abeoz9_hwmon_register(struct device *dev,#endif -static int abeoz9_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int abeoz9_probe (struct i2c_client *client) {struct abeoz9_rtc_data *data =NULL ;struct device *dev = &client->dev;
@@ -580,7 +579,7 @@ static struct i2c_driver abeoz9_driver = { .name = "rtc-ab-eoz9", .of_match_table = of_match_ptr(abeoz9_dt_match), }, - .probe = abeoz9_probe, + .probe_new = abeoz9_probe, .id_table = abeoz9_id, };
drivers/rtc/rtc-bq32k.c +2 -3
@@ -249,8 +249,7 @@ static void bq32k_sysfs_unregister(struct device *dev)device_remove_file (dev, &dev_attr_trickle_charge_bypass); } -static int bq32k_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int bq32k_probe (struct i2c_client *client) {struct device *dev = &client->dev;struct rtc_device *rtc;
@@ -322,7 +321,7 @@ static struct i2c_driver bq32k_driver = { .name = "bq32k", .of_match_table = of_match_ptr(bq32k_of_match), }, - .probe = bq32k_probe, + .probe_new = bq32k_probe, .remove = bq32k_remove, .id_table = bq32k_id, };
drivers/rtc/rtc-ds1374.c +2 -3
@@ -467,8 +467,7 @@ static const struct watchdog_ops ds1374_wdt_ops = {* ***************************************************************************** */ -static int ds1374_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int ds1374_probe (struct i2c_client *client) {struct ds1374 *ds1374;int ret;
@@ -575,7 +574,7 @@ static struct i2c_driver ds1374_driver = { .of_match_table = of_match_ptr(ds1374_of_match), .pm = &ds1374_pm, }, - .probe = ds1374_probe, + .probe_new = ds1374_probe, .remove = ds1374_remove, .id_table = ds1374_id, };
drivers/rtc/rtc-ds1672.c +2 -3
@@ -106,8 +106,7 @@ static const struct rtc_class_ops ds1672_rtc_ops = { .set_time = ds1672_set_time, }; -static int ds1672_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int ds1672_probe (struct i2c_client *client) {int err =0 ;struct rtc_device *rtc;
@@ -150,7 +149,7 @@ static struct i2c_driver ds1672_driver = { .name = "rtc-ds1672", .of_match_table = of_match_ptr(ds1672_of_match), }, - .probe = &ds1672_probe, + .probe_new = ds1672_probe, .id_table = ds1672_id, };
drivers/rtc/rtc-ds3232.c +2 -3
@@ -566,8 +566,7 @@ static const struct dev_pm_ops ds3232_pm_ops = { #if IS_ENABLED(CONFIG_I2C) -static int ds3232_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds3232_i2c_probe(struct i2c_client *client) { struct regmap *regmap; static const struct regmap_config config = {
@@ -604,7 +603,7 @@ static struct i2c_driver ds3232_driver = { .of_match_table = of_match_ptr(ds3232_of_match), .pm = &ds3232_pm_ops, }, - .probe = ds3232_i2c_probe, + .probe_new = ds3232_i2c_probe, .id_table = ds3232_id, };
drivers/rtc/rtc-em3027.c +2 -3
@@ -111,8 +111,7 @@ static const struct rtc_class_ops em3027_rtc_ops = { .set_time = em3027_set_time, }; -static int em3027_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int em3027_probe (struct i2c_client *client) {struct rtc_device *rtc;
@@ -148,7 +147,7 @@ static struct i2c_driver em3027_driver = { .name = "rtc-em3027", .of_match_table = of_match_ptr(em3027_of_match), }, - .probe = &em3027_probe, + .probe_new = em3027_probe, .id_table = em3027_id, };
drivers/rtc/rtc-fm3130.c +2 -3
@@ -340,8 +340,7 @@ static const struct rtc_class_ops fm3130_rtc_ops = {static struct i2c_driver fm3130_driver; -static int fm3130_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int fm3130_probe (struct i2c_client *client) {struct fm3130 *fm3130;int err = -ENODEV ;
@@ -518,7 +517,7 @@ static struct i2c_driver fm3130_driver = { .driver = { .name = "rtc-fm3130", }, - .probe = fm3130_probe, + .probe_new = fm3130_probe, .id_table = fm3130_id, };
drivers/rtc/rtc-hym8563.c +2 -3
@@ -495,8 +495,7 @@ static int hym8563_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(hym8563_pm_ops, hym8563_suspend, hym8563_resume); -static int hym8563_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int hym8563_probe (struct i2c_client *client) {struct hym8563 *hym8563;int ret;
@@ -572,7 +571,7 @@ static struct i2c_driver hym8563_driver = { .pm = &hym8563_pm_ops, .of_match_table = hym8563_dt_idtable, }, - .probe = hym8563_probe, + .probe_new = hym8563_probe, .id_table = hym8563_id, };
drivers/rtc/rtc-isl12022.c +2 -3
@@ -232,8 +232,7 @@ static const struct rtc_class_ops isl12022_rtc_ops = { .set_time = isl12022_rtc_set_time, }; -static int isl12022_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int isl12022_probe (struct i2c_client *client) {struct isl12022 *isl12022;
@@ -275,7 +274,7 @@ static struct i2c_driver isl12022_driver = { .of_match_table = of_match_ptr(isl12022_dt_match),#endif }, - .probe = isl12022_probe, + .probe_new = isl12022_probe, .id_table = isl12022_id, };
drivers/rtc/rtc-max6900.c +2 -3
@@ -197,8 +197,7 @@ static const struct rtc_class_ops max6900_rtc_ops = { .set_time = max6900_rtc_set_time, }; -static int -max6900_probe (struct i2c_client *client,const struct i2c_device_id *id) +static int max6900_probe (struct i2c_client *client) {struct rtc_device *rtc;
@@ -225,7 +224,7 @@ static struct i2c_driver max6900_driver = { .driver = { .name = "rtc-max6900", }, - .probe = max6900_probe, + .probe_new = max6900_probe, .id_table = max6900_id, };
drivers/rtc/rtc-pcf8523.c +2 -3
@@ -390,8 +390,7 @@ static const struct regmap_config regmap_config = { .max_register = 0x13, }; -static int pcf8523_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8523_probe (struct i2c_client *client) {struct pcf8523 *pcf8523;struct rtc_device *rtc;
@@ -485,7 +484,7 @@ static struct i2c_driver pcf8523_driver = { .name = "rtc-pcf8523", .of_match_table = pcf8523_of_match, }, - .probe = pcf8523_probe, + .probe_new = pcf8523_probe, .id_table = pcf8523_id, };module_i2c_driver (pcf8523_driver);
drivers/rtc/rtc-pcf85363.c +2 -3
@@ -350,8 +350,7 @@ static const struct pcf85x63_config pcf_85363_config = { .num_nvram = 2 }; -static int pcf85363_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf85363_probe (struct i2c_client *client) {struct pcf85363 *pcf85363;const struct pcf85x63_config *config = &pcf_85363_config;
@@ -436,7 +435,7 @@ static struct i2c_driver pcf85363_driver = { .name = "pcf85363", .of_match_table = of_match_ptr(dev_ids), }, - .probe = pcf85363_probe, + .probe_new = pcf85363_probe, };module_i2c_driver (pcf85363_driver);
drivers/rtc/rtc-pcf8563.c +2 -3
@@ -509,8 +509,7 @@ static const struct rtc_class_ops pcf8563_rtc_ops = { .alarm_irq_enable = pcf8563_irq_enable, }; -static int pcf8563_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8563_probe (struct i2c_client *client) {struct pcf8563 *pcf8563;int err;
@@ -606,7 +605,7 @@ static struct i2c_driver pcf8563_driver = { .name = "rtc-pcf8563", .of_match_table = of_match_ptr(pcf8563_of_match), }, - .probe = pcf8563_probe, + .probe_new = pcf8563_probe, .id_table = pcf8563_id, };
drivers/rtc/rtc-pcf8583.c +2 -3
@@ -275,8 +275,7 @@ static const struct rtc_class_ops pcf8583_rtc_ops = { .set_time = pcf8583_rtc_set_time, }; -static int pcf8583_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8583_probe (struct i2c_client *client) {struct pcf8583 *pcf8583;
@@ -307,7 +306,7 @@ static struct i2c_driver pcf8583_driver = { .driver = { .name = "pcf8583", }, - .probe = pcf8583_probe, + .probe_new = pcf8583_probe, .id_table = pcf8583_id, };
drivers/rtc/rtc-rv3029c2.c +2 -3
@@ -784,8 +784,7 @@ static const struct regmap_config config = { #if IS_ENABLED(CONFIG_I2C) -static int rv3029_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int rv3029_i2c_probe(struct i2c_client *client) { struct regmap *regmap; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK |
@@ -819,7 +818,7 @@ static struct i2c_driver rv3029_driver = { .name = "rv3029", .of_match_table = of_match_ptr(rv3029_of_match), }, - .probe = rv3029_i2c_probe, + .probe_new = rv3029_i2c_probe, .id_table = rv3029_id, };
drivers/rtc/rtc-rx6110.c +2 -3
@@ -419,8 +419,7 @@ static struct regmap_config regmap_i2c_config = { .read_flag_mask = 0x80, }; -static int rx6110_i2c_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int rx6110_i2c_probe (struct i2c_client *client) {struct i2c_adapter *adapter = client->adapter;struct rx6110_data *rx6110;
@@ -464,7 +463,7 @@ static struct i2c_driver rx6110_i2c_driver = { .name = RX6110_DRIVER_NAME, .acpi_match_table = rx6110_i2c_acpi_match, }, - .probe = rx6110_i2c_probe, + .probe_new = rx6110_i2c_probe, .id_table = rx6110_i2c_id, };
drivers/rtc/rtc-rx8581.c +2 -3
@@ -248,8 +248,7 @@ static const struct rx85x1_config rx8571_config = { .num_nvram = 2 }; -static int rx8581_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int rx8581_probe (struct i2c_client *client) {struct rx8581 *rx8581;const struct rx85x1_config *config = &rx8581_config;
@@ -326,7 +325,7 @@ static struct i2c_driver rx8581_driver = { .name = "rtc-rx8581", .of_match_table = of_match_ptr(rx8581_of_match), }, - .probe = rx8581_probe, + .probe_new = rx8581_probe, .id_table = rx8581_id, };
drivers/rtc/rtc-s35390a.c +2 -3
@@ -420,8 +420,7 @@ static const struct rtc_class_ops s35390a_rtc_ops = { .ioctl = s35390a_rtc_ioctl, }; -static int s35390a_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int s35390a_probe (struct i2c_client *client) {int err, err_read;unsigned int i;
@@ -502,7 +501,7 @@ static struct i2c_driver s35390a_driver = { .name = "rtc-s35390a", .of_match_table = of_match_ptr(s35390a_of_match), }, - .probe = s35390a_probe, + .probe_new = s35390a_probe, .id_table = s35390a_id, };
drivers/rtc/rtc-sd3078.c +2 -3
@@ -163,8 +163,7 @@ static const struct regmap_config regmap_config = { .max_register = 0x11, }; -static int sd3078_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int sd3078_probe (struct i2c_client *client) {int ret;struct sd3078 *sd3078;
@@ -218,7 +217,7 @@ static struct i2c_driver sd3078_driver = { .name = "sd3078", .of_match_table = of_match_ptr(rtc_dt_match), }, - .probe = sd3078_probe, + .probe_new = sd3078_probe, .id_table = sd3078_id, };
drivers/rtc/rtc-x1205.c +2 -3
@@ -614,8 +614,7 @@ static void x1205_sysfs_unregister(struct device *dev) } -static int x1205_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int x1205_probe (struct i2c_client *client) {int err =0 ;unsigned char sr;
@@ -681,7 +680,7 @@ static struct i2c_driver x1205_driver = { .name = "rtc-x1205", .of_match_table = x1205_dt_ids, }, - .probe = x1205_probe, + .probe_new = x1205_probe, .remove = x1205_remove, .id_table = x1205_id, };
base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
Signature · 1 line
2.30.2
Alexandre Belloni
maintainerHello,
Quoted 4 lines · Stephen Kitt
All these drivers have an i2c probe function which doesn't use the "struct
i2c_device_id*id" parameter, so they can trivially be converted to the "probe_new" style of probe with a single argument.
I think you should explain why you want to do that as the trend is to do the exact opposite to allow support for those RTCS on x86 systems.
Quoted 545 lines
This change was done using the following Coccinelle script, and fixed up for whitespace changes:
@ rule1 @
identifier fn;
identifier client, id;
@@- static int
fn(struct i2c_client *client, const struct i2c_device_id *id)
+ static intfn(struct i2c_client *client)
{
...when != id
}@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@struct
i2c_driverdriver = {(quoted diff) +1
-1- .probe + .probe_new=(
fn
|(quoted diff) +1
-1- &fn + fn)
, };Signed-off-by Stephen Kitt <[email protected]>--- drivers/rtc/rtc-ab-b5ze-s3.c | 5 ++--- drivers/rtc/rtc-ab-eoz9.c | 5 ++--- drivers/rtc/rtc-bq32k.c | 5 ++--- drivers/rtc/rtc-ds1374.c | 5 ++--- drivers/rtc/rtc-ds1672.c | 5 ++--- drivers/rtc/rtc-ds3232.c | 5 ++--- drivers/rtc/rtc-em3027.c | 5 ++--- drivers/rtc/rtc-fm3130.c | 5 ++--- drivers/rtc/rtc-hym8563.c | 5 ++--- drivers/rtc/rtc-isl12022.c | 5 ++--- drivers/rtc/rtc-max6900.c | 5 ++--- drivers/rtc/rtc-pcf8523.c | 5 ++--- drivers/rtc/rtc-pcf85363.c | 5 ++--- drivers/rtc/rtc-pcf8563.c | 5 ++--- drivers/rtc/rtc-pcf8583.c | 5 ++--- drivers/rtc/rtc-rv3029c2.c | 5 ++--- drivers/rtc/rtc-rx6110.c | 5 ++--- drivers/rtc/rtc-rx8581.c | 5 ++--- drivers/rtc/rtc-s35390a.c | 5 ++--- drivers/rtc/rtc-sd3078.c | 5 ++--- drivers/rtc/rtc-x1205.c | 5 ++--- 21 files changed, 42 insertions(+), 63 deletions(-)drivers/rtc/rtc-ab-b5ze-s3.c +2
-3@@ -817,8 +817,7 @@ static const struct regmap_config abb5zes3_rtc_regmap_config = { .val_bits = 8, }; -static int abb5zes3_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int abb5zes3_probe (struct i2c_client *client) {struct abb5zes3_rtc_data *data =NULL ;struct device *dev = &client->dev;@@ -945,7 +944,7 @@ static struct i2c_driver abb5zes3_driver = { .pm = &abb5zes3_rtc_pm_ops, .of_match_table = of_match_ptr(abb5zes3_dt_match), }, - .probe = abb5zes3_probe, + .probe_new = abb5zes3_probe, .id_table = abb5zes3_id, };module_i2c_driver (abb5zes3_driver);drivers/rtc/rtc-ab-eoz9.c +2
-3@@ -495,8 +495,7 @@ static void abeoz9_hwmon_register(struct device *dev,#endif -static int abeoz9_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int abeoz9_probe (struct i2c_client *client) {struct abeoz9_rtc_data *data =NULL ;struct device *dev = &client->dev;@@ -580,7 +579,7 @@ static struct i2c_driver abeoz9_driver = { .name = "rtc-ab-eoz9", .of_match_table = of_match_ptr(abeoz9_dt_match), }, - .probe = abeoz9_probe, + .probe_new = abeoz9_probe, .id_table = abeoz9_id, };drivers/rtc/rtc-bq32k.c +2
-3@@ -249,8 +249,7 @@ static void bq32k_sysfs_unregister(struct device *dev)device_remove_file (dev, &dev_attr_trickle_charge_bypass); } -static int bq32k_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int bq32k_probe (struct i2c_client *client) {struct device *dev = &client->dev;struct rtc_device *rtc;@@ -322,7 +321,7 @@ static struct i2c_driver bq32k_driver = { .name = "bq32k", .of_match_table = of_match_ptr(bq32k_of_match), }, - .probe = bq32k_probe, + .probe_new = bq32k_probe, .remove = bq32k_remove, .id_table = bq32k_id, };drivers/rtc/rtc-ds1374.c +2
-3@@ -467,8 +467,7 @@ static const struct watchdog_ops ds1374_wdt_ops = {* ***************************************************************************** */ -static int ds1374_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int ds1374_probe (struct i2c_client *client) {struct ds1374 *ds1374;int ret;@@ -575,7 +574,7 @@ static struct i2c_driver ds1374_driver = { .of_match_table = of_match_ptr(ds1374_of_match), .pm = &ds1374_pm, }, - .probe = ds1374_probe, + .probe_new = ds1374_probe, .remove = ds1374_remove, .id_table = ds1374_id, };drivers/rtc/rtc-ds1672.c +2
-3@@ -106,8 +106,7 @@ static const struct rtc_class_ops ds1672_rtc_ops = { .set_time = ds1672_set_time, }; -static int ds1672_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int ds1672_probe (struct i2c_client *client) {int err =0 ;struct rtc_device *rtc;@@ -150,7 +149,7 @@ static struct i2c_driver ds1672_driver = { .name = "rtc-ds1672", .of_match_table = of_match_ptr(ds1672_of_match), }, - .probe = &ds1672_probe, + .probe_new = ds1672_probe, .id_table = ds1672_id, };drivers/rtc/rtc-ds3232.c +2
-3@@ -566,8 +566,7 @@ static const struct dev_pm_ops ds3232_pm_ops = { #if IS_ENABLED(CONFIG_I2C) -static int ds3232_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds3232_i2c_probe(struct i2c_client *client) { struct regmap *regmap; static const struct regmap_config config = {@@ -604,7 +603,7 @@ static struct i2c_driver ds3232_driver = { .of_match_table = of_match_ptr(ds3232_of_match), .pm = &ds3232_pm_ops, }, - .probe = ds3232_i2c_probe, + .probe_new = ds3232_i2c_probe, .id_table = ds3232_id, };drivers/rtc/rtc-em3027.c +2
-3@@ -111,8 +111,7 @@ static const struct rtc_class_ops em3027_rtc_ops = { .set_time = em3027_set_time, }; -static int em3027_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int em3027_probe (struct i2c_client *client) {struct rtc_device *rtc;@@ -148,7 +147,7 @@ static struct i2c_driver em3027_driver = { .name = "rtc-em3027", .of_match_table = of_match_ptr(em3027_of_match), }, - .probe = &em3027_probe, + .probe_new = em3027_probe, .id_table = em3027_id, };drivers/rtc/rtc-fm3130.c +2
-3@@ -340,8 +340,7 @@ static const struct rtc_class_ops fm3130_rtc_ops = {static struct i2c_driver fm3130_driver; -static int fm3130_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int fm3130_probe (struct i2c_client *client) {struct fm3130 *fm3130;int err = -ENODEV ;@@ -518,7 +517,7 @@ static struct i2c_driver fm3130_driver = { .driver = { .name = "rtc-fm3130", }, - .probe = fm3130_probe, + .probe_new = fm3130_probe, .id_table = fm3130_id, };drivers/rtc/rtc-hym8563.c +2
-3@@ -495,8 +495,7 @@ static int hym8563_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(hym8563_pm_ops, hym8563_suspend, hym8563_resume); -static int hym8563_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int hym8563_probe (struct i2c_client *client) {struct hym8563 *hym8563;int ret;@@ -572,7 +571,7 @@ static struct i2c_driver hym8563_driver = { .pm = &hym8563_pm_ops, .of_match_table = hym8563_dt_idtable, }, - .probe = hym8563_probe, + .probe_new = hym8563_probe, .id_table = hym8563_id, };drivers/rtc/rtc-isl12022.c +2
-3@@ -232,8 +232,7 @@ static const struct rtc_class_ops isl12022_rtc_ops = { .set_time = isl12022_rtc_set_time, }; -static int isl12022_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int isl12022_probe (struct i2c_client *client) {struct isl12022 *isl12022;@@ -275,7 +274,7 @@ static struct i2c_driver isl12022_driver = { .of_match_table = of_match_ptr(isl12022_dt_match),#endif }, - .probe = isl12022_probe, + .probe_new = isl12022_probe, .id_table = isl12022_id, };drivers/rtc/rtc-max6900.c +2
-3@@ -197,8 +197,7 @@ static const struct rtc_class_ops max6900_rtc_ops = { .set_time = max6900_rtc_set_time, }; -static int -max6900_probe (struct i2c_client *client,const struct i2c_device_id *id) +static int max6900_probe (struct i2c_client *client) {struct rtc_device *rtc;@@ -225,7 +224,7 @@ static struct i2c_driver max6900_driver = { .driver = { .name = "rtc-max6900", }, - .probe = max6900_probe, + .probe_new = max6900_probe, .id_table = max6900_id, };drivers/rtc/rtc-pcf8523.c +2
-3@@ -390,8 +390,7 @@ static const struct regmap_config regmap_config = { .max_register = 0x13, }; -static int pcf8523_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8523_probe (struct i2c_client *client) {struct pcf8523 *pcf8523;struct rtc_device *rtc;@@ -485,7 +484,7 @@ static struct i2c_driver pcf8523_driver = { .name = "rtc-pcf8523", .of_match_table = pcf8523_of_match, }, - .probe = pcf8523_probe, + .probe_new = pcf8523_probe, .id_table = pcf8523_id, };module_i2c_driver (pcf8523_driver);drivers/rtc/rtc-pcf85363.c +2
-3@@ -350,8 +350,7 @@ static const struct pcf85x63_config pcf_85363_config = { .num_nvram = 2 }; -static int pcf85363_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf85363_probe (struct i2c_client *client) {struct pcf85363 *pcf85363;const struct pcf85x63_config *config = &pcf_85363_config;@@ -436,7 +435,7 @@ static struct i2c_driver pcf85363_driver = { .name = "pcf85363", .of_match_table = of_match_ptr(dev_ids), }, - .probe = pcf85363_probe, + .probe_new = pcf85363_probe, };module_i2c_driver (pcf85363_driver);drivers/rtc/rtc-pcf8563.c +2
-3@@ -509,8 +509,7 @@ static const struct rtc_class_ops pcf8563_rtc_ops = { .alarm_irq_enable = pcf8563_irq_enable, }; -static int pcf8563_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8563_probe (struct i2c_client *client) {struct pcf8563 *pcf8563;int err;@@ -606,7 +605,7 @@ static struct i2c_driver pcf8563_driver = { .name = "rtc-pcf8563", .of_match_table = of_match_ptr(pcf8563_of_match), }, - .probe = pcf8563_probe, + .probe_new = pcf8563_probe, .id_table = pcf8563_id, };drivers/rtc/rtc-pcf8583.c +2
-3@@ -275,8 +275,7 @@ static const struct rtc_class_ops pcf8583_rtc_ops = { .set_time = pcf8583_rtc_set_time, }; -static int pcf8583_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pcf8583_probe (struct i2c_client *client) {struct pcf8583 *pcf8583;@@ -307,7 +306,7 @@ static struct i2c_driver pcf8583_driver = { .driver = { .name = "pcf8583", }, - .probe = pcf8583_probe, + .probe_new = pcf8583_probe, .id_table = pcf8583_id, };drivers/rtc/rtc-rv3029c2.c +2
-3@@ -784,8 +784,7 @@ static const struct regmap_config config = { #if IS_ENABLED(CONFIG_I2C) -static int rv3029_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int rv3029_i2c_probe(struct i2c_client *client) { struct regmap *regmap; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK |@@ -819,7 +818,7 @@ static struct i2c_driver rv3029_driver = { .name = "rv3029", .of_match_table = of_match_ptr(rv3029_of_match), }, - .probe = rv3029_i2c_probe, + .probe_new = rv3029_i2c_probe, .id_table = rv3029_id, };drivers/rtc/rtc-rx6110.c +2
-3@@ -419,8 +419,7 @@ static struct regmap_config regmap_i2c_config = { .read_flag_mask = 0x80, }; -static int rx6110_i2c_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int rx6110_i2c_probe (struct i2c_client *client) {struct i2c_adapter *adapter = client->adapter;struct rx6110_data *rx6110;@@ -464,7 +463,7 @@ static struct i2c_driver rx6110_i2c_driver = { .name = RX6110_DRIVER_NAME, .acpi_match_table = rx6110_i2c_acpi_match, }, - .probe = rx6110_i2c_probe, + .probe_new = rx6110_i2c_probe, .id_table = rx6110_i2c_id, };drivers/rtc/rtc-rx8581.c +2
-3@@ -248,8 +248,7 @@ static const struct rx85x1_config rx8571_config = { .num_nvram = 2 }; -static int rx8581_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int rx8581_probe (struct i2c_client *client) {struct rx8581 *rx8581;const struct rx85x1_config *config = &rx8581_config;@@ -326,7 +325,7 @@ static struct i2c_driver rx8581_driver = { .name = "rtc-rx8581", .of_match_table = of_match_ptr(rx8581_of_match), }, - .probe = rx8581_probe, + .probe_new = rx8581_probe, .id_table = rx8581_id, };drivers/rtc/rtc-s35390a.c +2
-3@@ -420,8 +420,7 @@ static const struct rtc_class_ops s35390a_rtc_ops = { .ioctl = s35390a_rtc_ioctl, }; -static int s35390a_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int s35390a_probe (struct i2c_client *client) {int err, err_read;unsigned int i;@@ -502,7 +501,7 @@ static struct i2c_driver s35390a_driver = { .name = "rtc-s35390a", .of_match_table = of_match_ptr(s35390a_of_match), }, - .probe = s35390a_probe, + .probe_new = s35390a_probe, .id_table = s35390a_id, };drivers/rtc/rtc-sd3078.c +2
-3@@ -163,8 +163,7 @@ static const struct regmap_config regmap_config = { .max_register = 0x11, }; -static int sd3078_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int sd3078_probe (struct i2c_client *client) {int ret;struct sd3078 *sd3078;@@ -218,7 +217,7 @@ static struct i2c_driver sd3078_driver = { .name = "sd3078", .of_match_table = of_match_ptr(rtc_dt_match), }, - .probe = sd3078_probe, + .probe_new = sd3078_probe, .id_table = sd3078_id, };drivers/rtc/rtc-x1205.c +2
-3@@ -614,8 +614,7 @@ static void x1205_sysfs_unregister(struct device *dev) } -static int x1205_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int x1205_probe (struct i2c_client *client) {int err =0 ;unsigned char sr;@@ -681,7 +680,7 @@ static struct i2c_driver x1205_driver = { .name = "rtc-x1205", .of_match_table = x1205_dt_ids, }, - .probe = x1205_probe, + .probe_new = x1205_probe, .remove = x1205_remove, .id_table = x1205_id, };base-commit:
f2906aa863381afb0015a9eb7fefad885d4e5a56Signature · 1 line
2.30.2
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Alexandre,
Le 11/06/2022 16:48, Alexandre Belloni a écrit :
Quoted 8 lines · Stephen Kitt
Quoted 4 lines
All these drivers have an i2c probe function which doesn't use the "struct
i2c_device_id*id" parameter, so they can trivially be converted to the "probe_new" style of probe with a single argument.I think you should explain why you want to do that as the trend is to do the exact opposite to allow support for those RTCS on x86 systems.
Indeed, I should have given more context. The idea is to continue the transition started with https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b8a1a4cd5a98a2adf8dfd6902cd98e57d910ee12 (in 2016...). I²C drivers using probe() involve a call to i2c_match_id: in drivers/i2c/i2c-core-base.c,
/*
* When there are no more users of probe(),
* rename probe_new to probe.
*/
if (driver->probe_new)
status = driver->probe_new(client);
else if (driver->probe)
status = driver->probe(client,
i2c_match_id(driver->id_table,
client));
else
status = -EINVAL;Many drivers don't actually need the second parameter, so instead of having probe() with both parameters, the goal is to switch to a probe function with only "struct i2c_client *". Probe functions that *do* need the "struct i2c_device_id" can call i2c_match_id themselves (as is done currently with of_match_id).
I discussed this briefly with Wolfram beginning of June at Kernel Recipes, and as I understood it the plan was still to continue with this transition (in fact, the plan was for *me* to continue with this transition).
Do you have an example of a change requiring id to support RTCs on x86 systems?
Regards,
Stephen
Alexandre Belloni
maintainerQuoted 36 lines · Stephen Kitt
Hi Alexandre,
Le 11/06/2022 16:48, Alexandre Belloni a écrit :
Quoted 8 lines · Stephen Kitt
Quoted 4 lines
All these drivers have an i2c probe function which doesn't use the "struct
i2c_device_id*id" parameter, so they can trivially be converted to the "probe_new" style of probe with a single argument.I think you should explain why you want to do that as the trend is to do the exact opposite to allow support for those RTCS on x86 systems.
Indeed, I should have given more context. The idea is to continue the
transition started with https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b8a1a4cd5a98a2adf8dfd6902cd98e57d910ee12
(in 2016...). I²C drivers usingprobe()involve a call toi2c_match_id: indrivers/i2c/i2c-core-base.c,/* * When there are no more users of probe(), * rename probe_new to probe. */ if (driver->probe_new) status = driver->probe_new(client); else if (driver->probe) status = driver->probe(client, i2c_match_id(driver->id_table, client)); else status = -EINVAL;Many drivers don't actually need the second parameter, so instead of having
probe()with both parameters, the goal is to switch to a probe function with only "structi2c_client*". Probe functions that *do* need the "structi2c_device_id" can calli2c_match_idthemselves (as is done currently withof_match_id).
Quoted 6 lines
I discussed this briefly with Wolfram beginning of June at Kernel Recipes, and as I understood it the plan was still to continue with this transition (in fact, the plan was for *me* to continue with this transition).
Do you have an example of a change requiring id to support RTCs on x86 systems?
I checked and your patch is actually fine, the issue I referred to is:
1c1b3098ae1e ("rtc: pcf85063: add i2c_device_id name matching support")
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 7 lines · Alexandre Belloni
Quoted 2 lines · Stephen Kitt
Do you have an example of a change requiring id to support RTCs on x86 systems?
I checked and your patch is actually fine, the issue I referred to is:
1c1b3098ae1e("rtc: pcf85063: addi2c_device_idname matching support")
Ah yes, I see! The changes I’m making are compatible with that (as you figured out), I’m not removing the id tables, just avoiding calls to i2c_match_id when they’re not needed. In fact the approach I use for drivers which do need their id tables is the same as in the commit above, with an explicit call to i2c_match_id instead of the old-style probe.
Regards,
Stephen
Quoted 8 lines · Stephen Kitt
All these drivers have an i2c probe function which doesn't use the "struct
i2c_device_id*id" parameter, so they can trivially be converted to the "probe_new" style of probe with a single argument.This change was done using the following Coccinelle script, and fixed up for whitespace changes:
[...]
Applied, thanks!
[1/1] rtc: use simple i2c probe
commit: 4e4a13cc302ec6ea9b04422a02ebfd422e9eb9a8
Best regards,
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com