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

diff --cc drivers/clk/clk-cdce925.c
Simple merge

diff --cc drivers/clk/clk-si521xx.c
index ef4ba467e747bc791fbf231ecff494b61be92b01,0f8da64f87bb33874a2e6f32b6beb85f2c0947a3..4f7b74f889f1e7e9400a61f15d1e6671408bb1fc
--- 1/drivers/clk/clk-si521xx.c
--- 2/drivers/clk/clk-si521xx.c
+++ b/drivers/clk/clk-si521xx.c
@@@ -279,12 -279,11 +279,12 @@@ si521xx_of_clk_get(struct of_phandle_ar
  
  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 };
 -      struct si521xx *si;
 +      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;
  
        if (!chip_info)

diff --cc drivers/clk/clk-si5351.c
Simple merge

diff --cc drivers/clk/clk-si544.c
Simple merge

diff --cc drivers/clk/clk-si570.c
Simple merge