Merge tag 'trace-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[linux-2.6-block.git] / drivers / mfd / bcm590xx.c

diff --git a/drivers/mfd/bcm590xx.c b/drivers/mfd/bcm590xx.c
index 6ca337cde84c881fd99de411419822e398b4253a..251d515478d55fbb9854dc544443cf45024afda4 100644 (file)
--- a/drivers/mfd/bcm590xx.c
+++ b/drivers/mfd/bcm590xx.c
@@ -38,8 +38,7 @@ static const struct regmap_config bcm590xx_regmap_config_sec = {
        .cache_type     = REGCACHE_RBTREE,
 };
 
-static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri,
-                             const struct i2c_device_id *id)
+static int bcm590xx_i2c_probe(struct i2c_client *i2c_pri)
 {
        struct bcm590xx *bcm590xx;
        int ret;
@@ -109,7 +108,7 @@ static struct i2c_driver bcm590xx_i2c_driver = {
                   .name = "bcm590xx",
                   .of_match_table = bcm590xx_of_match,
        },
-       .probe = bcm590xx_i2c_probe,
+       .probe_new = bcm590xx_i2c_probe,
        .id_table = bcm590xx_i2c_id,
 };
 module_i2c_driver(bcm590xx_i2c_driver);