> -----Original Message----- > From: Uwe Kleine-König <uwe@kleine-koenig.org> > Sent: Freitag, 18. November 2022 23:39 > To: Angel Iglesias <ang.iglesiasg@gmail.com>; Lee Jones > <lee.jones@linaro.org>; Grant Likely <grant.likely@linaro.org>; Wolfram > Sang <wsa@kernel.org>; Hennerich, Michael > <Michael.Hennerich@analog.com>; Dmitry Torokhov > <dmitry.torokhov@gmail.com> > Cc: linux-i2c@vger.kernel.org; kernel@pengutronix.de; Uwe Kleine-König > <u.kleine-koenig@pengutronix.de>; linux-input@vger.kernel.org; linux- > kernel@vger.kernel.org > Subject: [PATCH 192/606] Input: adp5588-keys - Convert to i2c's > .probe_new() > > > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Michael Hennerich <michael.hennerich@analog.com> > --- > drivers/input/keyboard/adp5588-keys.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/input/keyboard/adp5588-keys.c > b/drivers/input/keyboard/adp5588-keys.c > index 7cd83c8e7110..72ae5ce72956 100644 > --- a/drivers/input/keyboard/adp5588-keys.c > +++ b/drivers/input/keyboard/adp5588-keys.c > @@ -718,8 +718,7 @@ static void adp5588_disable_regulator(void *reg) > regulator_disable(reg); > } > > -static int adp5588_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int adp5588_probe(struct i2c_client *client) > { > struct adp5588_kpad *kpad; > struct input_dev *input; > @@ -867,7 +866,7 @@ static struct i2c_driver adp5588_driver = { > .of_match_table = adp5588_of_match, > .pm = pm_sleep_ptr(&adp5588_dev_pm_ops), > }, > - .probe = adp5588_probe, > + .probe_new = adp5588_probe, > .remove = adp5588_remove, > .id_table = adp5588_id, > }; > -- > 2.38.1
Hello Dmitry, On Fri, Nov 18, 2022 at 11:38:46PM +0100, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> I didn't get any feedback from your side about this patch set. In case the problem is "only" to get the input patches out of this series, I recommend: b4 am -l -s -P191-267 20221118224540.619276-1-uwe@kleine-koenig.org Best regards Uwe
On Fri, Dec 02, 2022 at 11:52:27AM +0100, Uwe Kleine-König wrote: > Hello Dmitry, > > On Fri, Nov 18, 2022 at 11:38:46PM +0100, Uwe Kleine-König wrote: > > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > > The probe function doesn't make use of the i2c_device_id * parameter so it > > can be trivially converted. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > I didn't get any feedback from your side about this patch set. > > In case the problem is "only" to get the input patches out of this > series, I recommend: > > b4 am -l -s -P191-267 20221118224540.619276-1-uwe@kleine-koenig.org Thanks, I was trying to figure out how to consume the relevant portion. Applied now.
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 7cd83c8e7110..72ae5ce72956 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c @@ -718,8 +718,7 @@ static void adp5588_disable_regulator(void *reg) regulator_disable(reg); } -static int adp5588_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int adp5588_probe(struct i2c_client *client) { struct adp5588_kpad *kpad; struct input_dev *input; @@ -867,7 +866,7 @@ static struct i2c_driver adp5588_driver = { .of_match_table = adp5588_of_match, .pm = pm_sleep_ptr(&adp5588_dev_pm_ops), }, - .probe = adp5588_probe, + .probe_new = adp5588_probe, .remove = adp5588_remove, .id_table = adp5588_id, };