niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

clk: si570: use i2c_match_id and simple i2c probe

Browse source 
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.

Signed-off-by: Stephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20220407151831.2371706-10-steve@sk2.org
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Stephen Kitt 2022-04-07 17:18:30 +02:00 • committed by Stephen Boyd
parent 32a5c1d383
commit 2b349b893d
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/clk/clk-si570.c
View file

@ -398,11 +398,20 @@ static const struct regmap_config si570_regmap_config = {
.volatile_reg = si570_regmap_is_volatile, .volatile_reg = si570_regmap_is_volatile,
}; };
static int si570_probe(struct i2c_client *client, static const struct i2c_device_id si570_id[] = {
const struct i2c_device_id *id) { "si570", si57x },
{ "si571", si57x },
{ "si598", si59x },
{ "si599", si59x },
{ }
};
MODULE_DEVICE_TABLE(i2c, si570_id);
static int si570_probe(struct i2c_client *client)
{ {
struct clk_si570 *data; struct clk_si570 *data;
struct clk_init_data init; struct clk_init_data init;
const struct i2c_device_id *id = i2c_match_id(si570_id, client);
u32 initial_fout, factory_fout, stability; u32 initial_fout, factory_fout, stability;
bool skip_recall; bool skip_recall;
int err; int err;
@ -495,15 +504,6 @@ static int si570_remove(struct i2c_client *client)
return 0; return 0;
} }
static const struct i2c_device_id si570_id[] = {
{ "si570", si57x },
{ "si571", si57x },
{ "si598", si59x },
{ "si599", si59x },
{ }
};
MODULE_DEVICE_TABLE(i2c, si570_id);
static const struct of_device_id clk_si570_of_match[] = { static const struct of_device_id clk_si570_of_match[] = {
{ .compatible = "silabs,si570" }, { .compatible = "silabs,si570" },
{ .compatible = "silabs,si571" }, { .compatible = "silabs,si571" },
@ -518,7 +518,7 @@ static struct i2c_driver si570_driver = {
.name = "si570", .name = "si570",
.of_match_table = clk_si570_of_match, .of_match_table = clk_si570_of_match,
}, },
.probe = si570_probe, .probe_new = si570_probe,
.remove = si570_remove, .remove = si570_remove,
.id_table = si570_id, .id_table = si570_id,
}; };