Merge tag 'acpi-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git] / drivers / clk / clk-cdce706.c
index c91e909..5467d94 100644 (file)
@@ -627,8 +627,7 @@ of_clk_cdce_get(struct of_phandle_args *clkspec, void *data)
        return &cdce->clkout[idx].hw;
 }
 
-static int cdce706_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
+static int cdce706_probe(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
        struct cdce706_dev_data *cdce;
@@ -692,7 +691,7 @@ static struct i2c_driver cdce706_i2c_driver = {
                .name   = "cdce706",
                .of_match_table = of_match_ptr(cdce706_dt_match),
        },
-       .probe          = cdce706_probe,
+       .probe_new      = cdce706_probe,
        .remove         = cdce706_remove,
        .id_table       = cdce706_id,
 };