Hi Alexandru, On Thu, Nov 12, 2020 at 09:43:05AM +0200, Alexandru Ardelean wrote: > This change makes use of the devm_input_allocate_device() function, which > gets rid of the input_free_device() and input_unregister_device() calls. > > When a device is allocated via input_allocate_device(), the > input_register_device() call will also be device-managed, so there is no > longer need to manually call unregister. > > Also, the irq is allocated with the devm_request_threaded_irq(), so with > these two changes, the adp5589_keypad_remove() function is no longer > needed. > > This cleans up the error & exit paths. > It also looks like the input_free_device() should have been called on the > remove() hook, but doesn't look like it is. Actually it should not be called once input_unregister_device() is called. If you check, you will see that in probe() we set the pointer to input device to NULL after calling unregister, which makes subsequent call to input_free_device() a noop. We did that so that we have single error handling flow. I dropped this paragraph. > > This change may also also fix some potential leaks that were probably > omitted earlier. This one too. > > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> > --- > drivers/input/keyboard/adp5589-keys.c | 47 +++++++-------------------- > 1 file changed, 11 insertions(+), 36 deletions(-) > > diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c > index 922497b65ab0..e96ffd5ed69e 100644 > --- a/drivers/input/keyboard/adp5589-keys.c > +++ b/drivers/input/keyboard/adp5589-keys.c > @@ -909,7 +909,7 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid) > return -EINVAL; > } > > - input = input_allocate_device(); > + input = devm_input_allocate_device(&client->dev); > if (!input) > return -ENOMEM; > > @@ -953,38 +953,19 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid) > __set_bit(kpad->gpimap[i].sw_evt, input->swbit); > > error = input_register_device(input); > - if (error) { > - dev_err(&client->dev, "unable to register input device\n"); If you want to drop error messages, please send a separate patch with justification. I restored error messgaes, and applied. Thank you. -- Dmitry