Merge tag 'vfio-v6.4-rc1' of https://github.com/awilliam/linux-vfio

[linux-block.git] / drivers / clk / clk-si514.c

diff --git a/drivers/clk/clk-si514.c b/drivers/clk/clk-si514.c
index c028fa103bedabdd47891d6e5ab8eb11375ebf38..cabdd8e8f4dbd2855418668c56c00a9d4e486d18 100644 (file)
--- a/drivers/clk/clk-si514.c
+++ b/drivers/clk/clk-si514.c
@@ -360,8 +360,8 @@ static int si514_probe(struct i2c_client *client)
                dev_err(&client->dev, "clock registration failed\n");
                return err;
        }
-       err = of_clk_add_hw_provider(client->dev.of_node, of_clk_hw_simple_get,
-                                    &data->hw);
+       err = devm_of_clk_add_hw_provider(&client->dev, of_clk_hw_simple_get,
+                                         &data->hw);
        if (err) {
                dev_err(&client->dev, "unable to add clk provider\n");
                return err;
@@ -370,11 +370,6 @@ static int si514_probe(struct i2c_client *client)
        return 0;
 }
 
-static void si514_remove(struct i2c_client *client)
-{
-       of_clk_del_provider(client->dev.of_node);
-}
-
 static const struct i2c_device_id si514_id[] = {
        { "si514", 0 },
        { }
@@ -393,7 +388,6 @@ static struct i2c_driver si514_driver = {
                .of_match_table = clk_si514_of_match,
        },
        .probe_new      = si514_probe,
-       .remove         = si514_remove,
        .id_table       = si514_id,
 };
 module_i2c_driver(si514_driver);