Merge tag 'ntfs3_for_6.5' of https://github.com/Paragon-Software-Group/linux-ntfs3

[platform/kernel/linux-rpi.git] / drivers / mfd / max8925-i2c.c

diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index 4057fd1..7608000 100644 (file)
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -172,7 +172,6 @@ static int max8925_probe(struct i2c_client *client)
        chip->i2c = client;
        chip->dev = &client->dev;
        i2c_set_clientdata(client, chip);
-       dev_set_drvdata(chip->dev, chip);
        mutex_init(&chip->io_lock);
 
        chip->rtc = i2c_new_dummy_device(chip->i2c->adapter, RTC_I2C_ADDR);
@@ -240,7 +239,7 @@ static struct i2c_driver max8925_driver = {
                .pm     = pm_sleep_ptr(&max8925_pm_ops),
                .of_match_table = max8925_dt_ids,
        },
-       .probe_new      = max8925_probe,
+       .probe          = max8925_probe,
        .remove         = max8925_remove,
        .id_table       = max8925_id_table,
 };