clk: use i2c_match_id and simple i2c probe
PATCH 1/1 clk: use i2c_match_id and simple i2c probe
As part of the ongoing i2c transition to the simple probe ("probe_new"), this patch uses i2c_match_id to retrieve the driver_data for the probed device. The id parameter is thus no longer necessary and the simple probe can be used instead.
--- drivers/clk/clk-cdce925.c | 8 +++++--- drivers/clk/clk-si5351.c | 8 +++++--- drivers/clk/clk-si544.c | 8 +++++--- drivers/clk/clk-si570.c | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-)
drivers/clk/clk-cdce925.c +5 -3
@@ -634,11 +634,13 @@ static struct regmap_bus regmap_cdce925_bus = { .read = cdce925_regmap_i2c_read, }; -static int cdce925_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id cdce925_id[]; + +static int cdce925_probe (struct i2c_client *client) {struct clk_cdce925_chip *data;struct device_node *node = client->dev.of_node; +const struct i2c_device_id *id =i2c_match_id (cdce925_id, client);const char *parent_name;const char *pll_clk_name[MAX_NUMBER_OF_PLLS ] = {NULL ,};struct clk_init_data init;
@@ -837,7 +839,7 @@ static struct i2c_driver cdce925_driver = { .name = "cdce925", .of_match_table = of_match_ptr(clk_cdce925_of_match), }, - .probe = cdce925_probe, + .probe_new = cdce925_probe, .id_table = cdce925_id, };module_i2c_driver (cdce925_driver);
drivers/clk/clk-si5351.c +5 -3
@@ -1367,9 +1367,11 @@ si53351_of_clk_get(struct of_phandle_args *clkspec, void *data) }#endif /* CONFIG_OF */ -static int si5351_i2c_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id si5351_i2c_ids[]; + +static int si5351_i2c_probe (struct i2c_client *client) { +const struct i2c_device_id *id =i2c_match_id (si5351_i2c_ids, client);enum si5351_variant variant = (enum si5351_variant )id->driver_data;struct si5351_platform_data *pdata;struct si5351_driver_data *drvdata;
@@ -1663,7 +1665,7 @@ static struct i2c_driver si5351_driver = { .name = "si5351", .of_match_table = of_match_ptr(si5351_dt_ids), }, - .probe = si5351_i2c_probe, + .probe_new = si5351_i2c_probe, .remove = si5351_i2c_remove, .id_table = si5351_i2c_ids, };
drivers/clk/clk-si544.c +5 -3
@@ -451,11 +451,13 @@ static const struct regmap_config si544_regmap_config = { .volatile_reg = si544_regmap_is_volatile, }; -static int si544_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id si544_id[]; + +static int si544_probe (struct i2c_client *client) {struct clk_si544 *data;struct clk_init_data init; +const struct i2c_device_id *id =i2c_match_id (si544_id, client);int err; data =devm_kzalloc (&client->dev,sizeof (*data),GFP_KERNEL );
@@ -520,7 +522,7 @@ static struct i2c_driver si544_driver = { .name = "si544", .of_match_table = clk_si544_of_match, }, - .probe = si544_probe, + .probe_new = si544_probe, .id_table = si544_id, };module_i2c_driver (si544_driver);
drivers/clk/clk-si570.c +5 -3
@@ -398,11 +398,13 @@ static const struct regmap_config si570_regmap_config = { .volatile_reg = si570_regmap_is_volatile, }; -static int si570_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id si570_id[]; + +static int si570_probe (struct i2c_client *client) {struct clk_si570 *data;struct clk_init_data init; +const struct i2c_device_id *id =i2c_match_id (si570_id, client);u32 initial_fout, factory_fout, stability;bool skip_recall;int err;
@@ -518,7 +520,7 @@ static struct i2c_driver si570_driver = { .name = "si570", .of_match_table = clk_si570_of_match, }, - .probe = si570_probe, + .probe_new = si570_probe, .remove = si570_remove, .id_table = si570_id, };
Signature · 1 line
2.27.0
drivers/clk/clk-cdce925.c static struct regmap_bus regmap_cdce925_bus = { · line 638
Quoted 3 lines
drivers/clk/clk-cdce925.c +2
-0+static const struct i2c_device_id cdce925_id[]; +
Instead of this declaration, I think we should move the MODULE_DEVICE_TABLES up here.
Stephen Boyd
maintainerPlease fix the subject.
Quoting Stephen Kitt (2022-03-24 09:59:04)
Quoted 11 lines
As part of the ongoing i2c transition to the simple probe ("
probe_new"), this patch usesi2c_match_idto retrieve thedriver_datafor the probed device. The id parameter is thus no longer necessary and the simple probe can be used instead.Signed-off-by Stephen Kitt <[email protected]>--- drivers/clk/clk-cdce925.c | 8 +++++--- drivers/clk/clk-si5351.c | 8 +++++--- drivers/clk/clk-si544.c | 8 +++++--- drivers/clk/clk-si570.c | 8 +++++---
Also split the patch for each driver and send in one patch series with a cover letter. Then the subject can be appropriate for that driver instead of generic "clk:" which is only for core things. Looking at previous patches to these files should help with the subject line.