Merge tag 'regulator-fix-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / mfd / arizona-i2c.c

diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c
index bfc7cf5..b230158 100644 (file)
--- a/drivers/mfd/arizona-i2c.c
+++ b/drivers/mfd/arizona-i2c.c
@@ -20,9 +20,9 @@
 
 #include "arizona.h"
 
-static int arizona_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static int arizona_i2c_probe(struct i2c_client *i2c)
 {
+       const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
        const void *match_data;
        struct arizona *arizona;
        const struct regmap_config *regmap_config = NULL;
@@ -117,10 +117,10 @@ static const struct of_device_id arizona_i2c_of_match[] = {
 static struct i2c_driver arizona_i2c_driver = {
        .driver = {
                .name   = "arizona",
-               .pm     = &arizona_pm_ops,
+               .pm     = pm_ptr(&arizona_pm_ops),
                .of_match_table = of_match_ptr(arizona_i2c_of_match),
        },
-       .probe          = arizona_i2c_probe,
+       .probe_new      = arizona_i2c_probe,
        .remove         = arizona_i2c_remove,
        .id_table       = arizona_i2c_id,
 };