Merge tag 'percpu-for-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis...

[linux-block.git] / drivers / mfd / 88pm860x-core.c

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index aabac37c35025688993fc4886a88164a122f7b14..151bf03e772d161d80f62f9981573a1b3c8a49dd 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1166,7 +1166,6 @@ static int pm860x_probe(struct i2c_client *client)
        chip->client = client;
        i2c_set_clientdata(client, chip);
        chip->dev = &client->dev;
-       dev_set_drvdata(chip->dev, chip);
 
        /*
         * Both client and companion client shares same platform driver.
@@ -1251,7 +1250,7 @@ static struct i2c_driver pm860x_driver = {
                .pm     = pm_sleep_ptr(&pm860x_pm_ops),
                .of_match_table = pm860x_dt_ids,
        },
-       .probe_new      = pm860x_probe,
+       .probe          = pm860x_probe,
        .remove         = pm860x_remove,
        .id_table       = pm860x_id_table,
 };