From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752601AbbIKJ32 (ORCPT ); Fri, 11 Sep 2015 05:29:28 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:35117 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbbIKJ3Z (ORCPT ); Fri, 11 Sep 2015 05:29:25 -0400 Date: Fri, 11 Sep 2015 10:29:21 +0100 From: Lee Jones To: Kieran Bingham Cc: Wolfram Sang , Samuel Ortiz , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, grant.likely@linaro.org Subject: Re: [PATCH v4 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call Message-ID: <20150911092921.GM3260@x1> References: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> <1441823627-6227-8-git-send-email-kieranbingham@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1441823627-6227-8-git-send-email-kieranbingham@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 09 Sep 2015, Kieran Bingham wrote: > From: Lee Jones > > 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 > Signed-off-by: Lee Jones 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