diff options
author | Stephen Boyd <sboyd@kernel.org> | 2023-10-31 00:12:53 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2023-10-31 00:12:53 +0300 |
commit | 0a6d7f8275f255eda823c0f0b61d024f6f5b483d (patch) | |
tree | 522e0998b8f42fe935d00de153962c6de8152aab /drivers/clk/clk-si521xx.c | |
parent | 720e4a4a68670dfda638da236d374fc7a4be0a28 (diff) | |
parent | 7e52b1164a474dc7b90f68fbb40e35ccd7f7e2e2 (diff) | |
download | linux-0a6d7f8275f255eda823c0f0b61d024f6f5b483d.tar.xz |
Merge branch 'clk-cleanup' into clk-next
* clk-cleanup:
clk: si521xx: Increase stack based print buffer size in probe
clk: Use device_get_match_data()
clk: cdce925: Extend match support for OF tables
clk: si570: Simplify probe
clk: si5351: Simplify probe
clk: rs9: Use i2c_get_match_data() instead of device_get_match_data()
clk: clk-si544: Simplify probe() and is_valid_frequency()
clk: si521xx: Use i2c_get_match_data() instead of device_get_match_data()
clk: npcm7xx: Fix incorrect kfree
clk: at91: remove unnecessary conditions
clk: ti: fix double free in of_ti_divider_clk_setup()
clk: keystone: pll: fix a couple NULL vs IS_ERR() checks
clk: ralink: mtmips: quiet unused variable warning
clk: gate: fix comment typo and grammar
clk: asm9620: Remove 'hw' local variable that isn't checked
Diffstat (limited to 'drivers/clk/clk-si521xx.c')
-rw-r--r-- | drivers/clk/clk-si521xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/clk-si521xx.c b/drivers/clk/clk-si521xx.c index ef4ba467e747..4f7b74f889f1 100644 --- a/drivers/clk/clk-si521xx.c +++ b/drivers/clk/clk-si521xx.c @@ -279,10 +279,10 @@ si521xx_of_clk_get(struct of_phandle_args *clkspec, void *data) static int si521xx_probe(struct i2c_client *client) { - const u16 chip_info = (u16)(uintptr_t)device_get_match_data(&client->dev); + const u16 chip_info = (u16)(uintptr_t)i2c_get_match_data(client); const struct clk_parent_data clk_parent_data = { .index = 0 }; const u8 data[3] = { SI521XX_REG_BC, 1, 1 }; - unsigned char name[6] = "DIFF0"; + unsigned char name[16] = "DIFF0"; struct clk_init_data init = {}; struct si521xx *si; int i, ret; @@ -316,7 +316,7 @@ static int si521xx_probe(struct i2c_client *client) /* Register clock */ for (i = 0; i < hweight16(chip_info); i++) { memset(&init, 0, sizeof(init)); - snprintf(name, 6, "DIFF%d", i); + snprintf(name, sizeof(name), "DIFF%d", i); init.name = name; init.ops = &si521xx_diff_clk_ops; init.parent_data = &clk_parent_data; |