On Wed, 09 Sep 2015, Kieran Bingham wrote:
> From: Lee Jones <lee.jones@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
SoB?
> ---
> drivers/mfd/88pm860x-core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
> index 3269a99..a499d70 100644
> --- a/drivers/mfd/88pm860x-core.c
> +++ b/drivers/mfd/88pm860x-core.c
> @@ -1130,8 +1130,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;
> @@ -1257,7 +1256,7 @@ static struct i2c_driver pm860x_driver = {
> .pm = &pm860x_pm_ops,
> .of_match_table = pm860x_dt_ids,
> },
> - .probe = pm860x_probe,
> + .probe2 = pm860x_probe,
> .remove = pm860x_remove,
> .id_table = pm860x_id_table,
> };
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
