mfd: 88pm860x: Move over to new I2C device .probe() call

As part of an effort to rid the mostly unused second parameter for I2C
related .probe() functions and to conform to other existing frameworks
we're moving over to a temporary replacement .probe() call-back.

Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 25e1aafae60c2d1527f28c4998744d435522aef0..227b99018657e1361b0eb662fa2818283eab59e0 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1132,8 +1132,7 @@ static int pm860x_dt_init(struct device_node *np,
        return 0;
 }
 
-static int pm860x_probe(struct i2c_client *client,
-                                 const struct i2c_device_id *id)
+static int pm860x_probe(struct i2c_client *client)
 {
        struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);
        struct device_node *node = client->dev.of_node;
@@ -1259,7 +1258,7 @@ static struct i2c_driver pm860x_driver = {
                .pm     = &pm860x_pm_ops,
                .of_match_table = pm860x_dt_ids,
        },
-       .probe          = pm860x_probe,
+       .probe_new      = pm860x_probe,
        .remove         = pm860x_remove,
        .id_table       = pm860x_id_table,
 };